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

PR c++/87372 - __func__ constexpr evaluation.

Browse source 
* constexpr.c (maybe_constant_init_1): Pass false for strict down to
	cxx_eval_outermost_constant_expr.

	* g++.dg/cpp1y/func_constexpr2.C: New test.

From-SVN: r264489
This commit is contained in:
Marek Polacek 2018-09-21 18:45:59 +00:00 • committed by Marek Polacek
parent edaaef601d
commit 382955736e
4 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2018-09-21 Marek Polacek <polacek@redhat.com>
PR c++/87372 - __func__ constexpr evaluation.
* constexpr.c (maybe_constant_init_1): Pass false for strict down to
cxx_eval_outermost_constant_expr.
2018-09-20 Marek Polacek <polacek@redhat.com>
PR c++/87109 - wrong ctor with maybe-rvalue semantics.

2
gcc/cp/constexpr.c
View file

@ -5364,7 +5364,7 @@ maybe_constant_init_1 (tree t, tree decl, bool allow_non_constant,
/* No evaluation needed. */;
else
t = cxx_eval_outermost_constant_expr (t, allow_non_constant,
!allow_non_constant,
/*strict*/false,
pretend_const_required, decl);
if (TREE_CODE (t) == TARGET_EXPR)
{

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2018-09-21 Marek Polacek <polacek@redhat.com>
PR c++/87372 - __func__ constexpr evaluation.
* g++.dg/cpp1y/func_constexpr2.C: New test.
2018-09-21 Paul Thomas <pault@gcc.gnu.org>
PR fortran/77325

21
gcc/testsuite/g++.dg/cpp1y/func_constexpr2.C Normal file
View file

@ -0,0 +1,21 @@
// PR c++/87372
// { dg-do compile { target c++14 } }
constexpr int
foo (char const *s)
{
int i = 0;
while (s[i])
++i;
return i;
}
constexpr int
bar ()
{
constexpr int l = foo (__PRETTY_FUNCTION__);
constexpr int l2 = foo (__FUNCTION__);
constexpr int l3 = foo (__func__);
return l + l2 + l3;
}
static_assert (bar () == 25, "");