diff options
| author | Andrew Pinski <pinskia@gmail.com> | 2007-10-14 11:15:35 -0700 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2007-10-14 11:15:35 -0700 |
| commit | db160137f027cad2d3f2167b32073a0a11bbb9e4 (patch) | |
| tree | aa7fb51f6467b13b5c7ac8cea26573348bdb1e7b /gcc | |
| parent | b7cc2adf34650b8ce06f0d3744a7ff03eeca77ea (diff) | |
| download | gcc-db160137f027cad2d3f2167b32073a0a11bbb9e4.zip gcc-db160137f027cad2d3f2167b32073a0a11bbb9e4.tar.gz gcc-db160137f027cad2d3f2167b32073a0a11bbb9e4.tar.bz2 | |
re PR c++/30303 (ICE with invalid constructor definition)
2007-10-14 Andrew Pinski <pinskia@gmail.com>
PR c++/30303
* decl.c (grokfndecl): Return NULL after the "definition of
implicitly-declared" error happened.
2007-10-14 Andrew Pinski <pinskia@gmail.com>
PR c++/30303
* g++.dg/other/ctor1.C: New test.
* g++.dg/other/ctor2.C: New test.
* g++.dg/other/dtor1.C: New test.
From-SVN: r129298
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/ctor1.C | 11 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/ctor2.C | 17 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/dtor1.C | 17 |
6 files changed, 62 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bc25402..b81f0e8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-10-14 Andrew Pinski <pinskia@gmail.com> + + PR c++/30303 + * decl.c (grokfndecl): Return NULL after the "definition of + implicitly-declared" error happened. + 2007-10-12 Simon Martin <simartin@users.sourceforge.net> PR c++/26698 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 83195af..5553ec1 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6577,7 +6577,10 @@ grokfndecl (tree ctype, XXX Isn't this done in start_function, too? */ revert_static_member_fn (decl); if (DECL_ARTIFICIAL (old_decl)) - error ("definition of implicitly-declared %qD", old_decl); + { + error ("definition of implicitly-declared %qD", old_decl); + return NULL_TREE; + } /* Since we've smashed OLD_DECL to its DECL_TEMPLATE_RESULT, we must do the same to DECL. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 157d227..abfa770 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2007-10-14 Andrew Pinski <pinskia@gmail.com> + + PR c++/30303 + * g++.dg/other/ctor1.C: New test. + * g++.dg/other/ctor2.C: New test. + * g++.dg/other/dtor1.C: New test. + 2007-10-14 Tobias Burnus <burnus@gcc.gnu.org> * gfortran.dg/bounds_check_10.f90: Fix testcase. diff --git a/gcc/testsuite/g++.dg/other/ctor1.C b/gcc/testsuite/g++.dg/other/ctor1.C new file mode 100644 index 0000000..65449f4 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/ctor1.C @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +// PR C++/30303 +// This used to ICE because we did not return NULL +// in grokfndecl when an error happened. + +class A +{ + int i; +}; + +A::A() { A(); } /* { dg-error "definition of implicitly-declared" } */ diff --git a/gcc/testsuite/g++.dg/other/ctor2.C b/gcc/testsuite/g++.dg/other/ctor2.C new file mode 100644 index 0000000..65bd859 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/ctor2.C @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +// PR C++/30303 +// This used to ICE because we did not return NULL +// in grokfndecl when an error happened. + + +class A +{ + int i; +}; + +void foo() +{ + A(); +} + +A::A() {} /* { dg-error "definition of implicitly-declared" } */ diff --git a/gcc/testsuite/g++.dg/other/dtor1.C b/gcc/testsuite/g++.dg/other/dtor1.C new file mode 100644 index 0000000..90ca380 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/dtor1.C @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +// PR C++/30303 +// This used to ICE because we did not return NULL +// in grokfndecl when an error happened. + +struct Ifoo +{ +virtual ~Ifoo(){} +}; +struct foo : Ifoo +{ + foo(){}; +}; +foo::~foo() // { dg-error "definition of implicitly-declared" } +{ +delete this; +} |