I've got a fix for this in the works. Setting CALL_EXPR_RETURN_SLOT_OPT on the call returning NRVO is all we needed in the end.