diff options
| author | Jason Merrill <jason@redhat.com> | 2017-06-19 16:55:27 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-06-19 16:55:27 -0400 |
| commit | 66d052d5cb17463441615988fd2bbbeb292dfd04 (patch) | |
| tree | cf658c862ef492ee93f6b8be13890aaeacb72714 /gcc | |
| parent | ecc5761533690734622d57cbe25914c44d7913e1 (diff) | |
| download | gcc-66d052d5cb17463441615988fd2bbbeb292dfd04.zip gcc-66d052d5cb17463441615988fd2bbbeb292dfd04.tar.gz gcc-66d052d5cb17463441615988fd2bbbeb292dfd04.tar.bz2 | |
PR c++/80562 - ICE with constexpr if.
* semantics.c (finish_if_stmt_cond): Call
instantiate_non_dependent_expr.
From-SVN: r249387
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/constexpr-if12.C | 14 |
3 files changed, 22 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ff4280a..10d1ebd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2017-06-19 Jason Merrill <jason@redhat.com> + PR c++/80562 - ICE with constexpr if. + * semantics.c (finish_if_stmt_cond): Call + instantiate_non_dependent_expr. + PR c++/80829 - ICE with constexpr copy of base subobject. * constexpr.c (clear_no_implicit_zero): New. (cxx_eval_call_expression): Call it. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 5b5ec54..5fe772a 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -733,7 +733,10 @@ finish_if_stmt_cond (tree cond, tree if_stmt) if (IF_STMT_CONSTEXPR_P (if_stmt) && require_potential_rvalue_constant_expression (cond) && !value_dependent_expression_p (cond)) - cond = cxx_constant_value (cond, NULL_TREE); + { + cond = instantiate_non_dependent_expr (cond); + cond = cxx_constant_value (cond, NULL_TREE); + } finish_cond (&IF_COND (if_stmt), cond); add_stmt (if_stmt); THEN_CLAUSE (if_stmt) = push_stmt_list (); diff --git a/gcc/testsuite/g++.dg/cpp1z/constexpr-if12.C b/gcc/testsuite/g++.dg/cpp1z/constexpr-if12.C new file mode 100644 index 0000000..1ed2c30 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/constexpr-if12.C @@ -0,0 +1,14 @@ +// PR c++/80562 +// { dg-options -std=c++1z } + +struct T { + constexpr auto foo() { return false; } +}; + +template <class MustBeTemplate> +constexpr auto bf(T t) { + if constexpr(t.foo()) { + return false; + } + return true; +} |