diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-02-20 09:20:37 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-02-20 09:20:37 +0100 |
| commit | dda0944cd51484658f2e1d3ec39800fd6709b6af (patch) | |
| tree | e54da2161d4045acb043ddc96046fcf990042eb2 /gcc | |
| parent | 329a89d34cedb0aec759f9c4531d2dbba7f0937b (diff) | |
| download | gcc-dda0944cd51484658f2e1d3ec39800fd6709b6af.zip gcc-dda0944cd51484658f2e1d3ec39800fd6709b6af.tar.gz gcc-dda0944cd51484658f2e1d3ec39800fd6709b6af.tar.bz2 | |
re PR c++/84455 (ICE in build_call_a at gcc/cp/call.c:389 during error reporting)
PR c++/84455
* pt.c (tsubst_lambda_expr): If not nested, increment temporarily
function_depth to avoid GC during finish_lambda_function.
* g++.dg/cpp0x/lambda/lambda-ice26.C: New test.
From-SVN: r257838
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice26.C | 5 |
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 000e72f..726c095 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-02-20 Jakub Jelinek <jakub@redhat.com> + + PR c++/84455 + * pt.c (tsubst_lambda_expr): If not nested, increment temporarily + function_depth to avoid GC during finish_lambda_function. + 2018-02-19 Jason Merrill <jason@redhat.com> PR c++/84429 - ICE capturing VLA. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 8979071..bc03f0e 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -17070,6 +17070,10 @@ tsubst_lambda_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) bool nested = cfun; if (nested) push_function_context (); + else + /* Still increment function_depth so that we don't GC in the + middle of an expression. */ + ++function_depth; local_specialization_stack s (lss_copy); @@ -17084,6 +17088,8 @@ tsubst_lambda_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) if (nested) pop_function_context (); + else + --function_depth; /* The capture list was built up in reverse order; fix that now. */ LAMBDA_EXPR_CAPTURE_LIST (r) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 531d29a..9c1391e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-20 Jakub Jelinek <jakub@redhat.com> + + PR c++/84455 + * g++.dg/cpp0x/lambda/lambda-ice26.C: New test. + 2018-02-19 Paul Thomas <pault@gcc.gnu.org> PR fortran/83344 diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice26.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice26.C new file mode 100644 index 0000000..7544b27 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice26.C @@ -0,0 +1,5 @@ +// PR c++/84455 +// { dg-do compile { target c++11 } } +// { dg-options "--param ggc-min-heapsize=0" } + +#include "lambda-ice14.C" |