C++ PATCH to fix ICE with noexcept and -fgnu-tm (PR c++/80059)

Submitted by Marek Polacek on March 17, 2017, 2:45 p.m.

Details

Message ID 20170317144542.GB3172@redhat.com
State New
Headers show

Commit Message

Marek Polacek March 17, 2017, 2:45 p.m.
Paolo recently added the perform_implicit_conversion_flags call in
build_must_not_throw_expr which means that COND might now be an
IMPLICIT_CONV_EXPR.  That means we need to make sure that COND is instantiated
before we try to fold it, because we can get here while parsing a template. 

Me & Paolo discussed how to fix this, and I think the following is best.

Bootstrapped/regtested on x86_64-linux, ok for trunk?

2017-03-17  Marek Polacek  <polacek@redhat.com>
	    Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/80059 - ICE with noexcept and __transaction_atomic
	* except.c (build_must_not_throw_expr): Call
	instantiate_non_dependent_expr_sfinae.

	* g++.dg/tm/pr80059-2.C: New test.
	* g++.dg/tm/pr80059.C: New test.


	Marek

Comments

Jason Merrill March 18, 2017, 4:47 p.m.
On Fri, Mar 17, 2017 at 10:45 AM, Marek Polacek <polacek@redhat.com> wrote:
> +      cond = instantiate_non_dependent_expr_sfinae (cond, tf_none);

Why this rather than instantiate_non_dependent_expr (and so tf_error)?

Jason

Patch hide | download patch | download mbox

diff --git gcc/cp/except.c gcc/cp/except.c
index 45d00cc..298094e 100644
--- gcc/cp/except.c
+++ gcc/cp/except.c
@@ -271,6 +271,7 @@  build_must_not_throw_expr (tree body, tree cond)
       cond = perform_implicit_conversion_flags (boolean_type_node, cond,
 						tf_warning_or_error,
 						LOOKUP_NORMAL);
+      cond = instantiate_non_dependent_expr_sfinae (cond, tf_none);
       cond = cxx_constant_value (cond);
       if (integer_zerop (cond))
 	return body;
diff --git gcc/testsuite/g++.dg/tm/pr80059-2.C gcc/testsuite/g++.dg/tm/pr80059-2.C
index e69de29..10edb3a 100644
--- gcc/testsuite/g++.dg/tm/pr80059-2.C
+++ gcc/testsuite/g++.dg/tm/pr80059-2.C
@@ -0,0 +1,13 @@ 
+// PR c++/80059
+// { dg-do compile { target c++11 } }
+// { dg-options "-fgnu-tm" }
+
+template<typename T> int foo(T b)
+{
+  return __transaction_atomic noexcept(b) (0); // { dg-error "is not a constant expression" }
+}
+
+void bar()
+{
+  foo(true);
+}
diff --git gcc/testsuite/g++.dg/tm/pr80059.C gcc/testsuite/g++.dg/tm/pr80059.C
index e69de29..1b705b6 100644
--- gcc/testsuite/g++.dg/tm/pr80059.C
+++ gcc/testsuite/g++.dg/tm/pr80059.C
@@ -0,0 +1,13 @@ 
+// PR c++/80059
+// { dg-do compile { target c++11 } }
+// { dg-options "-fgnu-tm" }
+
+template<typename> int foo(bool b)
+{
+  return __transaction_atomic noexcept(b) (0); // { dg-error "is not a constant expression" }
+}
+
+void bar()
+{
+  foo<int>(true);
+}