aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tom@codesourcery.com>2013-09-07 23:31:48 +0000
committerTom de Vries <vries@gcc.gnu.org>2013-09-07 23:31:48 +0000
commit6df2ca09e94e60259ead0cc2b4bd07132674abbd (patch)
tree45fbb74b7008f26f4f84d65a5df5b4f3df0fbac9
parent9a7fb488e39b5380418fcf04341aa3e6b960266b (diff)
downloadgcc-6df2ca09e94e60259ead0cc2b4bd07132674abbd.zip
gcc-6df2ca09e94e60259ead0cc2b4bd07132674abbd.tar.gz
gcc-6df2ca09e94e60259ead0cc2b4bd07132674abbd.tar.bz2
Handle noexcept on transactions with -fno-exceptions
2013-09-08 Tom de Vries <tom@codesourcery.com> PR c++/58282 * except.c (build_must_not_throw_expr): Handle flag_exceptions. From-SVN: r202359
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/cp/except.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 98cda85..9f10291 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-08 Tom de Vries <tom@codesourcery.com>
+
+ PR c++/58282
+ * except.c (build_must_not_throw_expr): Handle
+ flag_exceptions.
+
2013-09-06 Jan Hubicka <jh@suse.cz>
* cgraphunit.c (expand_thunk): Get body before touching arguments.
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index fbebcba..c76d944 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -374,6 +374,9 @@ build_must_not_throw_expr (tree body, tree cond)
{
tree type = body ? TREE_TYPE (body) : void_type_node;
+ if (!flag_exceptions)
+ return body;
+
if (cond && !value_dependent_expression_p (cond))
{
cond = cxx_constant_value (cond);