re PR c++/60082 (Certain Cilk keywords executable Hanging for -O1)

	PR c++/60082
	* tree.c (build_common_builtin_nodes): Set ECF_LEAF for
	__builtin_setjmp_receiver.

	Revert
	2014-02-05  Balaji V. Iyer  <balaji.v.iyer@intel.com>

	* g++.dg/cilk-plus/CK/catch_exc.cc: Disable test for -O1.
	* c-c++-common/cilk-plus/CK/spawner_inline.c: Likewise.

From-SVN: r207597

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 07625f5..38a5f43 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-07  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/60082
+       * tree.c (build_common_builtin_nodes): Set ECF_LEAF for
+       __builtin_setjmp_receiver.
+
 2014-02-07  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/60092

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a5a636..32b6177 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-07  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/60082
+       Revert
+       2014-02-05  Balaji V. Iyer  <balaji.v.iyer@intel.com>
+
+       * g++.dg/cilk-plus/CK/catch_exc.cc: Disable test for -O1.
+       * c-c++-common/cilk-plus/CK/spawner_inline.c: Likewise.
+
 2014-02-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * gcc.target/s390/fp2int1.c: New testcase.

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c
index fae1c29..55ec223 100644 (file)
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c
@@ -1,7 +1,6 @@
 /* { dg-do run  { target { i?86-*-* x86_64-*-* } } } */
 /* { dg-options "-fcilkplus" } */
 /* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
-/* { dg-skip-if "" { *-*-* } { "-O1" } { "" } } */
 
 #include <stdlib.h>
 #define DEFAULT_VALUE 30

diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc
index ff5ccbf..0633d19 100644 (file)
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc
@@ -1,7 +1,6 @@
 /* { dg-options "-fcilkplus" } */
 /* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */
 /* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */
-/* { dg-skip-if "" { *-*-* } { "-O1" } { "" } } */
 
 #include <assert.h>
 #include <unistd.h>

diff --git a/gcc/tree.c b/gcc/tree.c
index 49767b6..d102d07 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -9980,7 +9980,7 @@ build_common_builtin_nodes (void)
   ftype = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE);
   local_define_builtin ("__builtin_setjmp_receiver", ftype,
                        BUILT_IN_SETJMP_RECEIVER,
-                       "__builtin_setjmp_receiver", ECF_NOTHROW);
+                       "__builtin_setjmp_receiver", ECF_NOTHROW | ECF_LEAF);
 
   ftype = build_function_type_list (ptr_type_node, NULL_TREE);
   local_define_builtin ("__builtin_stack_save", ftype, BUILT_IN_STACK_SAVE,