From ee6322c8c7f65ca85e1235608ce1ba6bbfd18bd7 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 25 Jun 2018 19:40:52 +0200 Subject: [PATCH] backport: re PR c++/85076 (ICE with invalid template used as lambda argument) Backported from mainline 2018-03-27 Jakub Jelinek PR c++/85076 * tree.c (cp_build_reference_type): If to_type is error_mark_node, return it right away. * g++.dg/cpp1y/pr85076.C: New test. From-SVN: r262087 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/tree.c | 4 ++++ gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/cpp1y/pr85076.C | 6 ++++++ 4 files changed, 17 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr85076.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 92171f91b911..7b8d599ed5f6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -3,6 +3,10 @@ Backported from mainline 2018-03-27 Jakub Jelinek + PR c++/85076 + * tree.c (cp_build_reference_type): If to_type is error_mark_node, + return it right away. + PR c++/85068 * class.c (update_vtable_entry_for_fn): Don't ICE if base_binfo is NULL. Assert if thunk_binfo is NULL then errorcount is non-zero. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 8077e9ae3e82..a861e51674a4 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -962,6 +962,10 @@ tree cp_build_reference_type (tree to_type, bool rval) { tree lvalue_ref, t; + + if (to_type == error_mark_node) + return error_mark_node; + lvalue_ref = build_reference_type (to_type); if (!rval) return lvalue_ref; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3eef4e304fb5..b69b29e40791 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -3,6 +3,9 @@ Backported from mainline 2018-03-27 Jakub Jelinek + PR c++/85076 + * g++.dg/cpp1y/pr85076.C: New test. + PR c++/85068 * g++.dg/inherit/covariant22.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp1y/pr85076.C b/gcc/testsuite/g++.dg/cpp1y/pr85076.C new file mode 100644 index 000000000000..6d54dea6c018 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr85076.C @@ -0,0 +1,6 @@ +// PR c++/85076 +// { dg-do compile { target c++14 } } + +template struct A*; // { dg-error "expected unqualified-id before" } + +auto a = [](A) {}; // { dg-error "is not a template|has incomplete type" } -- 2.47.2