From c80217c9fabc7bdcba6e098a4903a0d357333b8d Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 8 Oct 2013 21:58:58 +0000 Subject: [PATCH] re PR c++/58568 ([c++11] ICE with lambda in invalid template variable definition) /cp 2013-10-08 Paolo Carlini PR c++/58568 * lambda.c (begin_lambda_type): Check return value of xref_tag for error_mark_node; tidy. * decl.c (grokdeclarator): Tweak error message. /testsuite 2013-10-08 Paolo Carlini PR c++/58568 * g++.dg/cpp0x/lambda/lambda-ice10.C: New. * g++.old-deja/g++.mike/misc9.C: Adjust. From-SVN: r203289 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/decl.c | 4 ++-- gcc/cp/lambda.c | 4 ++-- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice10.C | 8 ++++++++ gcc/testsuite/g++.old-deja/g++.mike/misc9.C | 2 +- 6 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice10.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3e68712c2a4..70dab1eeaec 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2013-10-08 Paolo Carlini + + PR c++/58568 + * lambda.c (begin_lambda_type): Check return value of xref_tag + for error_mark_node; tidy. + * decl.c (grokdeclarator): Tweak error message. + 2013-10-08 Paolo Carlini PR c++/58665 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 81ed409b963..5f17a056079 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8774,8 +8774,8 @@ grokdeclarator (const cp_declarator *declarator, && !uniquely_derived_from_p (ctype, current_class_type)) { - error ("type %qT is not derived from type %qT", - ctype, current_class_type); + error ("invalid use of qualified-name %<%T::%D%>", + qualifying_scope, decl); return error_mark_node; } } diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index 2ffa7e01d78..2ecb17cfe91 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -138,6 +138,8 @@ begin_lambda_type (tree lambda) name, /*scope=*/ts_lambda, /*template_header_p=*/false); + if (type == error_mark_node) + return error_mark_node; } /* Designate it as a struct so that we can use aggregate initialization. */ @@ -152,8 +154,6 @@ begin_lambda_type (tree lambda) /* Start the class. */ type = begin_class_definition (type); - if (type == error_mark_node) - return error_mark_node; return type; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a45b913080a..fde103b9e55 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-10-08 Paolo Carlini + + PR c++/58568 + * g++.dg/cpp0x/lambda/lambda-ice10.C: New. + * g++.old-deja/g++.mike/misc9.C: Adjust. + 2013-10-08 Paolo Carlini PR c++/58665 diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice10.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice10.C new file mode 100644 index 00000000000..1ea59c21c84 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice10.C @@ -0,0 +1,8 @@ +// PR c++/58568 +// { dg-do compile { target c++11 } } + +template struct A +{ + static const int i; + template const int A::i = []{ return 0; }(); // { dg-error "invalid use" } +}; diff --git a/gcc/testsuite/g++.old-deja/g++.mike/misc9.C b/gcc/testsuite/g++.old-deja/g++.mike/misc9.C index 3d8858cf64a..7b9a86cbf4a 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/misc9.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/misc9.C @@ -8,6 +8,6 @@ class bee { class foo { public: - int bee::bar; // { dg-error "not derived" } you cannot do this + int bee::bar; // { dg-error "invalid use" } you cannot do this int me(); }; -- 2.30.2