diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-09-21 18:45:59 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-09-21 18:45:59 +0000 |
| commit | 382955736eca482bfebe5eecdc2eb6ac5f9f0d72 (patch) | |
| tree | a95f55fc8c34da8c13203cd8494c4c6f4bedce25 | |
| parent | edaaef601d0d6d263fba87b42d6d04c99dd23dba (diff) | |
| download | gcc-382955736eca482bfebe5eecdc2eb6ac5f9f0d72.zip gcc-382955736eca482bfebe5eecdc2eb6ac5f9f0d72.tar.gz gcc-382955736eca482bfebe5eecdc2eb6ac5f9f0d72.tar.bz2 | |
PR c++/87372 - __func__ constexpr evaluation.
* 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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/func_constexpr2.C | 21 |
4 files changed, 33 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b75d0c7..079d1cb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index b481474..08d00e8 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -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) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ea6cefb..c6ea7f1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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 diff --git a/gcc/testsuite/g++.dg/cpp1y/func_constexpr2.C b/gcc/testsuite/g++.dg/cpp1y/func_constexpr2.C new file mode 100644 index 0000000..b1576e6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/func_constexpr2.C @@ -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, ""); |