diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-02-01 20:32:33 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-02-01 20:32:33 +0000 |
| commit | d15f0fa7f9b7bc2eabb29429a7ca8556a3272625 (patch) | |
| tree | 87141f053acfbd2792d684a38597e1dba6ab99bd /gcc | |
| parent | ae976c332dca908d826a71cdc81d28af71552939 (diff) | |
| download | gcc-d15f0fa7f9b7bc2eabb29429a7ca8556a3272625.zip gcc-d15f0fa7f9b7bc2eabb29429a7ca8556a3272625.tar.gz gcc-d15f0fa7f9b7bc2eabb29429a7ca8556a3272625.tar.bz2 | |
re PR c++/84125 (ICE in generic lambda when static_assert argument is implicitly converted to bool)
PR c++/84125
* typeck.c (build_address): Relax the assert when
processing_template_decl.
* g++.dg/cpp1y/lambda-generic-84125.C:New test.
From-SVN: r257311
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/lambda-generic-84125.C | 10 |
4 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 897774e..5b6c75a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-02-01 Marek Polacek <polacek@redhat.com> + + PR c++/84125 + * typeck.c (build_address): Relax the assert when + processing_template_decl. + 2018-02-01 Jason Merrill <jason@redhat.com> PR c++/84126 - ICE with variadic generic lambda diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 1102f67..83e7678 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5735,7 +5735,8 @@ build_address (tree t) { if (error_operand_p (t) || !cxx_mark_addressable (t)) return error_mark_node; - gcc_checking_assert (TREE_CODE (t) != CONSTRUCTOR); + gcc_checking_assert (TREE_CODE (t) != CONSTRUCTOR + || processing_template_decl); t = build_fold_addr_expr_loc (EXPR_LOCATION (t), t); if (TREE_CODE (t) != ADDR_EXPR) t = rvalue (t); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8ce7c29..64af747 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-01 Marek Polacek <polacek@redhat.com> + + PR c++/84125 + * g++.dg/cpp1y/lambda-generic-84125.C:New test. + 2018-01-30 Jeff Law <law@redhat.com> PR target/84128 diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-84125.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-84125.C new file mode 100644 index 0000000..8bf6a09 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-84125.C @@ -0,0 +1,10 @@ +// PR c++/84125 +// { dg-do compile { target c++14 } } + +struct X { constexpr operator bool() const { return true; } }; + +int main(){ + [](auto) { + static_assert(X{}, ""); + }; +} |