From 743ee9d5fe51ecab8866cdf1bf67424457aeea0c Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 2 Mar 2018 17:55:28 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/typeck.c | 2 ++ gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice28.C | 9 +++++++++ 4 files changed, 18 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice28.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 29287c8d0bb..112e13a9672 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 PR c++/84662 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 0e7c63dd197..f535902231d 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 42160721e0e..670d388b884 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 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 00000000000..5fe32129744 --- /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" } +} -- 2.30.2