From c9db39e16e1644f929b3018e42d9674402bed409 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 23 Mar 2018 21:54:50 +0100 Subject: [PATCH] re PR c++/85015 (internal compiler error: tree check: expected class 'type', have 'exceptional' (error_mark) in build_int_cst, at tree.c:1360) PR c++/85015 * decl.c (compute_array_index_type): Set osize to mark_rvalue_use result. * g++.dg/cpp0x/pr85015.C: New test. From-SVN: r258822 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 2 +- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/cpp0x/pr85015.C | 12 ++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr85015.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 619161bf323..52af5464090 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2018-03-23 Jakub Jelinek + PR c++/85015 + * decl.c (compute_array_index_type): Set osize to mark_rvalue_use + result. + PR c++/84942 * pt.c (tsubst_copy_and_build) : Replace cp_build_unary_op call with gcc_unreachable (). diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 0aa4ac20b53..96d4b723b4a 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -9520,7 +9520,7 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain) if (!type_dependent_expression_p (size)) { - size = mark_rvalue_use (size); + osize = size = mark_rvalue_use (size); if (cxx_dialect < cxx11 && TREE_CODE (size) == NOP_EXPR && TREE_SIDE_EFFECTS (size)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 419bd560dc5..99696f3745c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2018-03-23 Jakub Jelinek + PR c++/85015 + * g++.dg/cpp0x/pr85015.C: New test. + PR c++/84942 * g++.dg/cpp1y/pr84942.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr85015.C b/gcc/testsuite/g++.dg/cpp0x/pr85015.C new file mode 100644 index 00000000000..38dc7cbd2a4 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr85015.C @@ -0,0 +1,12 @@ +// PR c++/85015 +// { dg-do compile { target c++11 } } +// { dg-options "" } + +void +foo () +{ + int &&c = v + 1; // { dg-error "was not declared in this scope" } + struct S { // { dg-message "declared here" "" { target *-*-* } .-1 } + void bar () { int a[c]; } // { dg-error "use of local variable with automatic storage from containing function" } + } e; +} -- 2.30.2