diff options
| author | Marek Polacek <polacek@redhat.com> | 2019-09-15 20:22:27 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2019-09-15 20:22:27 +0000 |
| commit | 2abc02a1f5e6078f67172c64b22e91b8a5f1884e (patch) | |
| tree | 2bcd0b531ffe4ae651ea96a955ec7e3e752d9407 /gcc | |
| parent | 41fb55fd5cb551f4b32d9ca122f45140acbb1f26 (diff) | |
| download | gcc-2abc02a1f5e6078f67172c64b22e91b8a5f1884e.zip gcc-2abc02a1f5e6078f67172c64b22e91b8a5f1884e.tar.gz gcc-2abc02a1f5e6078f67172c64b22e91b8a5f1884e.tar.bz2 | |
PR c++/91740 - ICE with constexpr call and ?: in ARRAY_REF.
* pt.c (build_non_dependent_expr): Call build_non_dependent_expr for
the first operand.
* g++.dg/cpp1y/var-templ63.C: New test.
From-SVN: r275736
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/var-templ63.C | 5 |
4 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bca3075..e92d49f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-09-15 Marek Polacek <polacek@redhat.com> + + PR c++/91740 - ICE with constexpr call and ?: in ARRAY_REF. + * pt.c (build_non_dependent_expr): Call build_non_dependent_expr for + the first operand. + 2019-09-15 Nathan Sidwell <nathan@acm.org> * cp-tree.h (DECL_CLONED_FUNCTION_P): Reimplement using diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 54d2813..9de1b8f 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -26710,7 +26710,7 @@ build_non_dependent_expr (tree expr) if (TREE_CODE (expr) == COND_EXPR) return build3 (COND_EXPR, TREE_TYPE (expr), - TREE_OPERAND (expr, 0), + build_non_dependent_expr (TREE_OPERAND (expr, 0)), (TREE_OPERAND (expr, 1) ? build_non_dependent_expr (TREE_OPERAND (expr, 1)) : build_non_dependent_expr (TREE_OPERAND (expr, 0))), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7e10fb4..6a5ba09 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-09-15 Marek Polacek <polacek@redhat.com> + + PR c++/91740 - ICE with constexpr call and ?: in ARRAY_REF. + * g++.dg/cpp1y/var-templ63.C: New test. + 2019-09-15 Sandra Loosemore <sandra@codesourcery.com> * lib/target-supports.exp diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ63.C b/gcc/testsuite/g++.dg/cpp1y/var-templ63.C new file mode 100644 index 0000000..a65f53b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ63.C @@ -0,0 +1,5 @@ +// PR c++/91740 - ICE with constexpr call and ?: in ARRAY_REF. +// { dg-do compile { target c++14 } } + +constexpr bool f(const char*) { return true; } +template<typename T> const char c = "FOO"[f("BAR") ? 1 : 0]; |