From 8df457cbe80c8d2755b13b9c08026eb94de1c397 Mon Sep 17 00:00:00 2001 From: jakub Date: Fri, 7 Feb 2014 10:49:08 +0000 Subject: [PATCH] PR c++/60082 * tree.c (build_common_builtin_nodes): Set ECF_LEAF for __builtin_setjmp_receiver. Revert 2014-02-05 Balaji V. Iyer * g++.dg/cilk-plus/CK/catch_exc.cc: Disable test for -O1. * c-c++-common/cilk-plus/CK/spawner_inline.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207597 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 9 +++++++++ gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c | 1 - gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc | 1 - gcc/tree.c | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 07625f5..38a5f43 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-02-07 Jakub Jelinek + + PR c++/60082 + * tree.c (build_common_builtin_nodes): Set ECF_LEAF for + __builtin_setjmp_receiver. + 2014-02-07 Richard Biener PR middle-end/60092 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1a5a636..32b6177 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2014-02-07 Jakub Jelinek + + PR c++/60082 + Revert + 2014-02-05 Balaji V. Iyer + + * 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 * 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 --- 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 #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 --- 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 #include diff --git a/gcc/tree.c b/gcc/tree.c index 49767b6..d102d07 100644 --- 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, -- 2.7.4