From 0450a9665e7b06791114a521a20a691e2a1dbf2b Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 14 Aug 2008 15:11:01 +0000 Subject: [PATCH] re PR c++/34600 (ICE with invalid use of extern) /cp 2008-08-14 Paolo Carlini PR c++/34600 * decl.c (grokdeclarator): In case of extern and initializer, return error_mark_node after the error. /testsuite 2008-08-14 Paolo Carlini PR c++/34600 * g++.dg/parse/crash43.C: New. From-SVN: r139099 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 5 ++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/parse/crash43.C | 9 +++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/parse/crash43.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e34fb2270a9..48aab06d245 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-08-14 Paolo Carlini + + PR c++/34600 + * decl.c (grokdeclarator): In case of extern and initializer, return + error_mark_node after the error. + 2008-08-13 Manuel Lopez-Ibanez PR 30551 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 3cd251128f1..b0531604d02 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -9270,7 +9270,10 @@ grokdeclarator (const cp_declarator *declarator, warning (0, "%qs initialized and declared %", name); } else - error ("%qs has both % and initializer", name); + { + error ("%qs has both % and initializer", name); + return error_mark_node; + } } /* Record `register' declaration for warnings on & diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bdbc3542e9e..5355b4df23a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-08-14 Paolo Carlini + + PR c++/34600 + * g++.dg/parse/crash43.C: New. + 2008-08-14 Manuel Lopez-Ibanez PR c/28152 diff --git a/gcc/testsuite/g++.dg/parse/crash43.C b/gcc/testsuite/g++.dg/parse/crash43.C new file mode 100644 index 00000000000..84fe8c5186c --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/crash43.C @@ -0,0 +1,9 @@ +// PR c++/34600 + +namespace N +{ + void foo() + { + extern int i = 0; // { dg-error "error: 'i' has both 'extern' and initializer" } + } +}