procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: check DECL_INITIAL for constexpr

Browse source 
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.
This commit is contained in:
Jason Merrill 2022-09-20 17:12:29 -04:00
parent bbdb5612f6
commit 73d9b0e594
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/constexpr.cc
View file

@ -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)

4
gcc/testsuite/g++.dg/cpp1y/constexpr-local4.C
View file

@ -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 "" }

2
gcc/testsuite/g++.dg/cpp2a/consteval24.C
View file

@ -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" }

2
gcc/testsuite/g++.dg/cpp2a/consteval7.C
View file

@ -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" }

2
gcc/testsuite/g++.dg/cpp2a/inline-asm3.C
View file

@ -9,4 +9,4 @@ foo ()
return i;
}
constexpr int i = foo ();
constexpr int i = foo (); // { dg-error "foo" }