From 413803d3d8166febfdde1cceb9f81807d429f01e Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Tue, 1 Aug 2006 23:45:11 +0000 Subject: [PATCH] re PR c++/28250 (ICE with invalid catch) PR c++/28250 PR c++/28257 PR c++/28259 PR c++/28267 * toplev.c (compile_file): Return early on errorcount or sorrycount. * cgraphunit.c (cgraph_finalize_compilation_unit): Likewise. (cgraph_optimize): Likewise. PR c++/28250 * g++.dg/eh/catch4.C: New test. PR c++/28257 * g++.dg/other/qual1.C: New test. PR c++/28259 * g++.dg/inherit/error2.C: New test. PR c++/28267 * g++.dg/other/new1.C: New test. * g++.dg/warn/pr23075.C: Remove obsolete test. * g++.old-deja/g++.brendan/crash52.C: Remove dg-warning marker. * g++.old-deja/g++.jason/report.C: Remove dg-warning marker. From-SVN: r115866 --- gcc/ChangeLog | 10 ++++++++++ gcc/cgraphunit.c | 6 ++++++ gcc/testsuite/ChangeLog | 18 ++++++++++++++++++ gcc/testsuite/g++.dg/eh/catch4.C | 8 ++++++++ gcc/testsuite/g++.dg/inherit/error2.C | 16 ++++++++++++++++ gcc/testsuite/g++.dg/other/new1.C | 14 ++++++++++++++ gcc/testsuite/g++.dg/other/qual1.C | 11 +++++++++++ gcc/testsuite/g++.dg/warn/pr23075.C | 5 ----- .../g++.old-deja/g++.brendan/crash52.C | 3 +-- gcc/testsuite/g++.old-deja/g++.jason/report.C | 4 ++-- gcc/toplev.c | 2 +- 11 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/g++.dg/eh/catch4.C create mode 100644 gcc/testsuite/g++.dg/inherit/error2.C create mode 100644 gcc/testsuite/g++.dg/other/new1.C create mode 100644 gcc/testsuite/g++.dg/other/qual1.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8cf26707b74..aaba0cc6f56 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2006-08-01 Volker Reichelt + + PR c++/28250 + PR c++/28257 + PR c++/28259 + PR c++/28267 + * toplev.c (compile_file): Return early on errorcount or sorrycount. + * cgraphunit.c (cgraph_finalize_compilation_unit): Likewise. + (cgraph_optimize): Likewise. + 2006-08-01 Stuart Hastings * rtl.h (UINTVAL) New. diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 606cd75ef92..256850224db 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -1018,6 +1018,9 @@ cgraph_finalize_compilation_unit (void) static struct cgraph_node *first_analyzed; static struct cgraph_varpool_node *first_analyzed_var; + if (errorcount || sorrycount) + return; + finish_aliases_1 (); if (!flag_unit_at_a_time) @@ -1466,6 +1469,9 @@ ipa_passes (void) void cgraph_optimize (void) { + if (errorcount || sorrycount) + return; + #ifdef ENABLE_CHECKING verify_cgraph (); #endif diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1e1effcfbc6..48701d0b781 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,21 @@ +2006-08-01 Volker Reichelt + + PR c++/28250 + * g++.dg/eh/catch4.C: New test. + + PR c++/28257 + * g++.dg/other/qual1.C: New test. + + PR c++/28259 + * g++.dg/inherit/error2.C: New test. + + PR c++/28267 + * g++.dg/other/new1.C: New test. + + * g++.dg/warn/pr23075.C: Remove obsolete test. + * g++.old-deja/g++.brendan/crash52.C: Remove dg-warning marker. + * g++.old-deja/g++.jason/report.C: Remove dg-warning marker. + 2006-07-31 Mark Mitchell PR c++/28523 diff --git a/gcc/testsuite/g++.dg/eh/catch4.C b/gcc/testsuite/g++.dg/eh/catch4.C new file mode 100644 index 00000000000..34cf712125f --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/catch4.C @@ -0,0 +1,8 @@ +// PR c++/28250 +// { dg-do compile } + +void foo() +{ + try { throw; } + catch () {} // { dg-error "type-specifier" } +} diff --git a/gcc/testsuite/g++.dg/inherit/error2.C b/gcc/testsuite/g++.dg/inherit/error2.C new file mode 100644 index 00000000000..5a7c2940d27 --- /dev/null +++ b/gcc/testsuite/g++.dg/inherit/error2.C @@ -0,0 +1,16 @@ +// PR c++/28259 +// { dg-do compile } + +struct A +{ + virtual A* foo(); +}; + +struct B : virtual A; // { dg-error "before" } + +struct C : A +{ + virtual B* foo(); +}; + +B* C::foo() { return 0; } diff --git a/gcc/testsuite/g++.dg/other/new1.C b/gcc/testsuite/g++.dg/other/new1.C new file mode 100644 index 00000000000..30b651326aa --- /dev/null +++ b/gcc/testsuite/g++.dg/other/new1.C @@ -0,0 +1,14 @@ +// PR c++/28267 +// { dg-do compile } + +struct A +{ + A(); + void* operator new(__SIZE_TYPE__, int = X); // { dg-error "not declared" } + void operator delete(void*, int); +}; + +void foo() +{ + new A; +} diff --git a/gcc/testsuite/g++.dg/other/qual1.C b/gcc/testsuite/g++.dg/other/qual1.C new file mode 100644 index 00000000000..bd6f234931c --- /dev/null +++ b/gcc/testsuite/g++.dg/other/qual1.C @@ -0,0 +1,11 @@ +// PR c++/28257 +// { dg-do compile } + +struct A +{ + int i; + void foo() + { + int A::i = i; // { dg-error "extra qualification|not a static member" } + } +}; diff --git a/gcc/testsuite/g++.dg/warn/pr23075.C b/gcc/testsuite/g++.dg/warn/pr23075.C index cc71deada53..1521b658139 100644 --- a/gcc/testsuite/g++.dg/warn/pr23075.C +++ b/gcc/testsuite/g++.dg/warn/pr23075.C @@ -7,8 +7,3 @@ foo (void) { return; // { dg-error "with no value" } } // { dg-bogus "control reaches end" } - -int -bar (void) -{ -} // { dg-warning "control reaches end" } diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash52.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash52.C index 95c6a08322e..9e72fb5cbb0 100644 --- a/gcc/testsuite/g++.old-deja/g++.brendan/crash52.C +++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash52.C @@ -10,5 +10,4 @@ public: A &f(A &a) {// { dg-error "" } new decl.* std::cout << "Blah\n"; -} // { dg-warning "" } no return - +} diff --git a/gcc/testsuite/g++.old-deja/g++.jason/report.C b/gcc/testsuite/g++.old-deja/g++.jason/report.C index 77fd7c32d8c..e2d805e082c 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/report.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/report.C @@ -56,7 +56,7 @@ bar2 baz (X::Y y) // { dg-error "" } in this context bar2 wa [5]; wa[0] = baz(f); undef2 (1); // { dg-error "" } implicit declaration -} // { dg-warning "" } no return +} int ninny () { @@ -71,4 +71,4 @@ int ninny () int darg (char X::*p) { undef3 (1); // { dg-error "" } implicit declaration -} // { dg-warning "" } no return +} diff --git a/gcc/toplev.c b/gcc/toplev.c index f6ff302d1f4..55019ed5413 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1006,7 +1006,7 @@ compile_file (void) what's left of the symbol table output. */ timevar_pop (TV_PARSE); - if (flag_syntax_only) + if (flag_syntax_only || errorcount || sorrycount) return; lang_hooks.decls.final_write_globals (); -- 2.30.2