diff options
| author | Jason Merrill <jason@redhat.com> | 2009-06-09 14:18:45 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-06-09 14:18:45 -0400 |
| commit | 869fef887fff96f4c8914ef2be5beeef4b08228a (patch) | |
| tree | dad17071f244d2fe7716b6c257e1e97a922da0a2 | |
| parent | dc2a6925a1f049491a12be6e36233088bc123c62 (diff) | |
| download | gcc-869fef887fff96f4c8914ef2be5beeef4b08228a.zip gcc-869fef887fff96f4c8914ef2be5beeef4b08228a.tar.gz gcc-869fef887fff96f4c8914ef2be5beeef4b08228a.tar.bz2 | |
re PR c++/40381 (Revision 142379 caused ICE with deleted functions)
PR c++/40381
* decl2.c (mark_used): Return after complaining about deleted fn.
From-SVN: r148319
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/defaulted10.C | 14 |
4 files changed, 24 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c4e84aa..76f83c6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2009-06-09 Jason Merrill <jason@redhat.com> + + PR c++/40381 + * decl2.c (mark_used): Return after complaining about deleted fn. + 2009-06-08 Jason Merrill <jason@redhat.com> * parser.c (cp_parser_type_id_1): 'auto' type is ok with a diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index d368ea8..b4f4404 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3809,6 +3809,7 @@ mark_used (tree decl) { error ("deleted function %q+D", decl); error ("used here"); + return; } /* If we don't need a value, then we don't need to synthesize DECL. */ if (skip_evaluation) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8ecbde7..1d5b50a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2009-06-09 Jason Merrill <jason@redhat.com> + + * g++.dg/cpp0x/defaulted10.C: New. + 2009-06-09 Martin Jambor <mjambor@suse.cz> * testsuite/gcc.c-torture/compile/pr40351.c: New file. diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted10.C b/gcc/testsuite/g++.dg/cpp0x/defaulted10.C new file mode 100644 index 0000000..d169e0c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted10.C @@ -0,0 +1,14 @@ +// PR c++/40381 +// { dg-options "-std=gnu++0x" } + +struct A +{ + template<typename T> void foo(T) = delete; // { dg-error "previously|deleted" } +}; + +template<typename T> void A::foo(T) {} // { dg-error "redefinition" } + +void bar() +{ + A().foo(0); // { dg-error "used" } +} |