summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog3
-rw-r--r--gcc/cilk-common.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9bed95db219..113dcf034a2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
2014-02-08 Jakub Jelinek <jakub@redhat.com>
+ * cilk-common.c (cilk_init_builtins): Clear TREE_NOTHROW
+ flag on __cilkrts_rethrow builtin.
+
PR ipa/60026
* ipa-cp.c (determine_versionability): Fail at -O0
or __attribute__((optimize (0))) or -fno-ipa-cp functions.
diff --git a/gcc/cilk-common.c b/gcc/cilk-common.c
index afe88c95e6b..f2a3b7594d6 100644
--- a/gcc/cilk-common.c
+++ b/gcc/cilk-common.c
@@ -264,6 +264,7 @@ cilk_init_builtins (void)
/* __cilkrts_rethrow (struct stack_frame *); */
cilk_rethrow_fndecl = install_builtin ("__cilkrts_rethrow", fptr_fun,
BUILT_IN_CILK_RETHROW, false);
+ TREE_NOTHROW (cilk_rethrow_fndecl) = 0;
/* __cilkrts_save_fp_ctrl_state (__cilkrts_stack_frame *); */
cilk_save_fp_fndecl = install_builtin ("__cilkrts_save_fp_ctrl_state",