diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-03-02 17:55:28 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-03-02 17:55:28 +0000 |
| commit | 743ee9d5fe51ecab8866cdf1bf67424457aeea0c (patch) | |
| tree | f0f14edfd5a86569d2157afb0d0aa8ce58c9c42e | |
| parent | 8c8f2ab7081d2e14b637c57583072392c3aeac88 (diff) | |
| download | gcc-743ee9d5fe51ecab8866cdf1bf67424457aeea0c.zip gcc-743ee9d5fe51ecab8866cdf1bf67424457aeea0c.tar.gz gcc-743ee9d5fe51ecab8866cdf1bf67424457aeea0c.tar.bz2 | |
re PR c++/84664 (internal compiler error: in cp_perform_integral_promotions, at cp/typeck.c:2172)
PR c++/84664
* typeck.c (cp_perform_integral_promotions): Check the result of
mark_rvalue_use.
* g++.dg/cpp0x/lambda/lambda-ice28.C: New test.
From-SVN: r258149
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice28.C | 9 |
4 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 29287c8..112e13a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -3,6 +3,10 @@ PR c++/84663 * decl.c (cp_complete_array_type): Check error_mark_node. + PR c++/84664 + * typeck.c (cp_perform_integral_promotions): Check the result of + mark_rvalue_use. + 2018-03-02 Jakub Jelinek <jakub@redhat.com> PR c++/84662 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 0e7c63d..f535902 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -2161,6 +2161,8 @@ cp_perform_integral_promotions (tree expr, tsubst_flags_t complain) tree promoted_type; expr = mark_rvalue_use (expr); + if (error_operand_p (expr)) + return error_mark_node; /* [conv.prom] diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4216072..670d388 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -6,6 +6,9 @@ PR c++/84663 * g++.dg/parse/array-size3.C: New test. + PR c++/84664 + * g++.dg/cpp0x/lambda/lambda-ice28.C: New test. + 2018-03-02 Jakub Jelinek <jakub@redhat.com> PR c++/84662 diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice28.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice28.C new file mode 100644 index 0000000..5fe3212 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice28.C @@ -0,0 +1,9 @@ +// PR c++/84664 +// { dg-do compile { target c++11 } } + +void +foo () +{ + auto &b = 1; // { dg-error "cannot bind" } + [] { b > 0; }; // { dg-error ".b. is not captured" } +} |