diff options
Diffstat (limited to 'gcc/cp/semantics.c')
| -rw-r--r-- | gcc/cp/semantics.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index cd48570..ac7856b 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -371,6 +371,33 @@ void finish_return_stmt (expr) tree expr; { + if (doing_semantic_analysis_p () && !processing_template_decl) + expr = check_return_expr (expr); + + if (doing_semantic_analysis_p () && !processing_template_decl) + { + if (DECL_CONSTRUCTOR_P (current_function_decl) && ctor_label) + { + /* Even returns without a value in a constructor must return + `this'. We accomplish this by sending all returns in a + constructor to the CTOR_LABEL; finish_function emits code to + return a value there. When we finally generate the real + return statement, CTOR_LABEL is no longer set, and we fall + through into the normal return-processing code below. */ + finish_goto_stmt (ctor_label); + return; + } + else if (DECL_DESTRUCTOR_P (current_function_decl)) + { + /* Similarly, all destructors must run destructors for + base-classes before returning. So, all returns in a + destructor get sent to the DTOR_LABEL; finsh_function emits + code to return a value there. */ + finish_goto_stmt (dtor_label); + return; + } + } + if (building_stmt_tree ()) add_tree (build_min_nt (RETURN_STMT, expr)); else |