From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 14 Jan 2016 22:23:09 +0000 (+0000)
Subject: [cilkplus] Fix cilk_spawn gimplification bug (PR cilkplus/69048)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d600da59d17089584cb8fb6b9bae6da269624e5;p=thirdparty%2Fgcc.git

[cilkplus] Fix cilk_spawn gimplification bug (PR cilkplus/69048)

	PR c++/69048
	* cilk.c (create_cilk_wrapper_body): Call fold_build_cleanup_point_expr
	 to add missing cleanup point.

	PR c++/69048
	* g++.dg/cilk-plus/CK/pr69048.cc: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232393 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index e3b9654c85b0..af215511546e 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-14 Ryan Burn  <contact@rnburn.com>
+
+	PR c++/69048
+	* cilk.c (create_cilk_wrapper_body): Call fold_build_cleanup_point_expr
+	 to add missing cleanup point.
+
 2016-01-14  David Malcolm  <dmalcolm@redhat.com>
 
 	PR c++/68819
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index 57dfa4120a54..4d6be33d818e 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -592,6 +592,11 @@ create_cilk_wrapper_body (tree stmt, struct wrapper_data *wd)
   for (p = wd->parms; p; p = TREE_CHAIN (p))
     DECL_CONTEXT (p) = fndecl;
 
+  /* The statement containing the spawn expression might create temporaries with
+     destructors defined; if so we need to add a CLEANUP_POINT_EXPR to ensure
+     the expression is properly gimplified.  */
+  stmt = fold_build_cleanup_point_expr (void_type_node, stmt);
+
   gcc_assert (!DECL_SAVED_TREE (fndecl));
   cilk_install_body_with_frame_cleanup (fndecl, stmt, (void *) wd);
   gcc_assert (DECL_SAVED_TREE (fndecl));
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d2ad41c41550..05ae50bb69ab 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-14 Ryan Burn  <contact@rnburn.com>
+
+	PR c++/69048
+	* g++.dg/cilk-plus/CK/pr69048.cc: New test.
+
 2016-01-14  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR testsuite/67509
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/pr69048.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/pr69048.cc
new file mode 100644
index 000000000000..b6c57fca9a45
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/pr69048.cc
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-fcilkplus" } */
+
+struct A {
+  ~A () {}
+};
+
+A f () {
+  return A ();
+}
+
+void t1 () {
+  _Cilk_spawn f ();
+}