From 6df2ca09e94e60259ead0cc2b4bd07132674abbd Mon Sep 17 00:00:00 2001
From: Tom de Vries <tom@codesourcery.com>
Date: Sat, 7 Sep 2013 23:31:48 +0000
Subject: [PATCH] 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
---
 gcc/ChangeLog   | 6 ++++++
 gcc/cp/except.c | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 98cda853635..9f10291e732 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 fbebcbafdcb..c76d9440aa9 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);