diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-02-26 18:41:56 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-02-26 18:41:56 +0000 |
| commit | b671df813a16a75345cceb35030333ccc36c39f9 (patch) | |
| tree | d2c3affe041c9a19ead072fc443fabfb82d2b796 | |
| parent | 40b864f1411f5cd892ce778e8f38a2ad0f05c388 (diff) | |
| download | gcc-b671df813a16a75345cceb35030333ccc36c39f9.zip gcc-b671df813a16a75345cceb35030333ccc36c39f9.tar.gz gcc-b671df813a16a75345cceb35030333ccc36c39f9.tar.bz2 | |
re PR c++/84325 (internal compiler error, in cxx_eval_constant_expression gcc/cp/constexpr.c:4740)
PR c++/84325
* tree.c (replace_placeholders_r): Only check TREE_CONSTANT on
non-types.
* g++.dg/cpp1z/pr84325.C: New test.
From-SVN: r258008
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/pr84325.C | 17 |
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 59d4cee..7499992 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-02-26 Marek Polacek <polacek@redhat.com> + + PR c++/84325 + * tree.c (replace_placeholders_r): Only check TREE_CONSTANT on + non-types. + 2018-02-26 Jason Merrill <jason@redhat.com> PR c++/84447 - ICE with deleted inherited ctor with default arg. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 39c1ef2..41d9002 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3091,7 +3091,7 @@ replace_placeholders_r (tree* t, int* walk_subtrees, void* data_) replace_placeholders_t *d = static_cast<replace_placeholders_t*>(data_); tree obj = d->obj; - if (TREE_CONSTANT (*t)) + if (TYPE_P (*t) || TREE_CONSTANT (*t)) { *walk_subtrees = false; return NULL_TREE; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ba25b2e..6fd236c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-26 Marek Polacek <polacek@redhat.com> + + PR c++/84325 + * g++.dg/cpp1z/pr84325.C: New test. + 2018-02-26 Carl Love <cel@us.ibm.com> * gcc.target/powerpc/builtins-3.c: Move vec_neg builtin tests to diff --git a/gcc/testsuite/g++.dg/cpp1z/pr84325.C b/gcc/testsuite/g++.dg/cpp1z/pr84325.C new file mode 100644 index 0000000..dddadc3 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/pr84325.C @@ -0,0 +1,17 @@ +// PR c++/84325 +// { dg-do compile } +// { dg-options "-std=c++17" } + +struct seconds { int i_{0}; constexpr seconds (int) {} }; +template <char... _Digits> constexpr seconds operator""_s() { + return seconds(0); +} +constexpr seconds operator""_s(long double i) { + return seconds(0); +} +template<class TYPE> +struct Param { + constexpr static inline seconds time_to_wait{10_s}; +}; +struct Empty {}; +Param<Empty> p; |