aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2014-01-29 12:13:01 -0500
committerJason Merrill <jason@gcc.gnu.org>2014-01-29 12:13:01 -0500
commit8ae90330f06696b7ae591f9391651223e09f749a (patch)
treee0f98d2c3992a14e7100fdfc1fcc2f24d5e2550d /gcc/cp
parent4f7c83caa328ea011365f786c19953af274bb0c8 (diff)
downloadgcc-8ae90330f06696b7ae591f9391651223e09f749a.zip
gcc-8ae90330f06696b7ae591f9391651223e09f749a.tar.gz
gcc-8ae90330f06696b7ae591f9391651223e09f749a.tar.bz2
re PR c++/59916 (constructors and destructors can cause "control reaches end of non-void function" warnings with -Os)
PR c++/59916 * optimize.c (maybe_thunk_body): Build a RETURN_EXPR for cdtor_returns_this case. From-SVN: r207271
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/optimize.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f2ff37a..594861b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
2014-01-29 Jason Merrill <jason@redhat.com>
+ PR c++/59916
+ * optimize.c (maybe_thunk_body): Build a RETURN_EXPR for
+ cdtor_returns_this case.
+
PR c++/59315
* decl.c (cxx_maybe_build_cleanup): Call mark_used.
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 1b3f10a..b089432 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -405,8 +405,8 @@ maybe_thunk_body (tree fn, bool force)
clone_result = DECL_RESULT (clone);
modify = build2 (MODIFY_EXPR, TREE_TYPE (clone_result),
clone_result, call);
+ modify = build1 (RETURN_EXPR, void_type_node, modify);
add_stmt (modify);
- BLOCK_VARS (block) = clone_result;
}
else
{