diff mbox series

[pushed] c++: check DECL_INITIAL for constexpr

Message ID 20220929175120.1916164-1-jason@redhat.com
State New, archived
Headers
Series [pushed] c++: check DECL_INITIAL for constexpr |

Commit Message

Jason Merrill Sept. 29, 2022, 5:51 p.m. UTC 
  Tested x86_64-pc-linux-gnu, applying to trunk.

-- >8 --

We were overlooking non-potentially-constant bits in variable initializer
because we didn't walk into DECL_INITIAL.

gcc/cp/ChangeLog:

	* constexpr.cc (potential_constant_expression_1): Look into
	DECL_INITIAL.  Use location wrappers.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp1y/constexpr-local4.C: Expect error sooner.
	* g++.dg/cpp2a/consteval24.C: Likewise.
	* g++.dg/cpp2a/consteval7.C: Likewise.
	* g++.dg/cpp2a/inline-asm3.C: Likewise.
---
 gcc/cp/constexpr.cc                           | 7 +++++--
 gcc/testsuite/g++.dg/cpp1y/constexpr-local4.C | 4 ++--
 gcc/testsuite/g++.dg/cpp2a/consteval24.C      | 2 +-
 gcc/testsuite/g++.dg/cpp2a/consteval7.C       | 2 +-
 gcc/testsuite/g++.dg/cpp2a/inline-asm3.C      | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)


base-commit: af9034827e8f06f10767064e9fc7443b94e08184
prerequisite-patch-id: b1512f7473cce4cc8f21dbc772d07bd59c632e5e
prerequisite-patch-id: f3aeb477456e3d56d2d570d4bad334cb45e6bccf
diff mbox series

Patch

diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc
index 10639876d9c..ed41d755269 100644
--- a/gcc/cp/constexpr.cc
+++ b/gcc/cp/constexpr.cc
@@ -8892,7 +8892,10 @@  potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
       {
         tree from = TREE_OPERAND (t, 0);
 	if (location_wrapper_p (t))
-	  return (RECUR (from, want_rval));
+	  {
+	    iloc_sentinel ils = loc;
+	    return (RECUR (from, want_rval));
+	  }
 	if (INDIRECT_TYPE_P (TREE_TYPE (t)))
 	  {
 	    STRIP_ANY_LOCATION_WRAPPER (from);
@@ -9348,7 +9351,7 @@  potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
 		   (tmp, /*constexpr_context_p=*/true, flags))
 	    return false;
 	}
-      return RECUR (tmp, want_rval);
+      return RECUR (DECL_INITIAL (tmp), want_rval);
 
     case TRY_FINALLY_EXPR:
       return (RECUR (TREE_OPERAND (t, 0), want_rval)
diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-local4.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-local4.C
index bef62488579..647b5dcd7cd 100644
--- a/gcc/testsuite/g++.dg/cpp1y/constexpr-local4.C
+++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-local4.C
@@ -10,8 +10,8 @@  const A a = 42;
 
 constexpr int f()
 {
-  const int j = a.i;		// { dg-message "'a'" }
+  const int j = a.i;		// { dg-error "'a'" }
   return j;
 }
 
-static_assert (f() == 42,"");	// { dg-error "non-constant" }
+static_assert (f() == 42,"");	// { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/consteval24.C b/gcc/testsuite/g++.dg/cpp2a/consteval24.C
index 6d0c63c749b..6d7034c5515 100644
--- a/gcc/testsuite/g++.dg/cpp2a/consteval24.C
+++ b/gcc/testsuite/g++.dg/cpp2a/consteval24.C
@@ -27,4 +27,4 @@  bar ()
   return fn1 () + fn2 () + (s.*fn3) () + (s.*fn4) () + fn5 () + (s.*fn6) () + (s.*fn7) ();
 }
 
-auto a = bar ();
+auto a = bar ();		// { dg-error "bar" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/consteval7.C b/gcc/testsuite/g++.dg/cpp2a/consteval7.C
index 23f3d25a39e..74996d31a82 100644
--- a/gcc/testsuite/g++.dg/cpp2a/consteval7.C
+++ b/gcc/testsuite/g++.dg/cpp2a/consteval7.C
@@ -10,4 +10,4 @@  consteval int qux () { S s = baz (); return s.b + s.c (); }
 consteval int quux () { constexpr S s = baz (); return s.b + s.c (); }	// { dg-error "immediate evaluation returns address of immediate function 'consteval int foo\\(\\)'" }
 constexpr auto d = baz ();	// { dg-error "immediate evaluation returns address of immediate function 'consteval int foo\\(\\)'" }
 constexpr auto e = qux ();
-constexpr auto f = quux ();
+constexpr auto f = quux ();	// { dg-error "quux" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/inline-asm3.C b/gcc/testsuite/g++.dg/cpp2a/inline-asm3.C
index a7476b1d9d1..a6f612e2447 100644
--- a/gcc/testsuite/g++.dg/cpp2a/inline-asm3.C
+++ b/gcc/testsuite/g++.dg/cpp2a/inline-asm3.C
@@ -9,4 +9,4 @@  foo ()
  return i;
 }
 
-constexpr int i = foo ();
+constexpr int i = foo ();	// { dg-error "foo" }