diff options
Diffstat (limited to 'gcc/cp/typeck.c')
| -rw-r--r-- | gcc/cp/typeck.c | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 1588cbc..55b3ef3 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5989,9 +5989,29 @@ check_return_expr (tree retval) /* Effective C++ rule 15. See also start_function. */ if (warn_ecpp - && DECL_NAME (current_function_decl) == ansi_assopname(NOP_EXPR) - && retval != current_class_ref) - warning ("`operator=' should return a reference to `*this'"); + && DECL_NAME (current_function_decl) == ansi_assopname(NOP_EXPR)) + { + bool warn = true; + + /* The function return type must be a reference to the current + class. */ + if (TREE_CODE (valtype) == REFERENCE_TYPE + && same_type_ignoring_top_level_qualifiers_p + (TREE_TYPE (valtype), TREE_TYPE (current_class_ref))) + { + /* Returning '*this' is obviously OK. */ + if (retval == current_class_ref) + warn = false; + /* If we are calling a function whose return type is the same of + the current class reference, it is ok. */ + else if (TREE_CODE (retval) == INDIRECT_REF + && TREE_CODE (TREE_OPERAND (retval, 0)) == CALL_EXPR) + warn = false;
+ } + + if (warn) + warning ("`operator=' should return a reference to `*this'"); + } /* The fabled Named Return Value optimization, as per [class.copy]/15: |