/cp

2008-01-24  Paolo Carlini  <pcarlini@suse.de>

        PR c++/34603
        * pt.c (push_template_decl_real): Return error_mark_node in case
	of template definition of non-template.

/testsuite
2008-01-24  Paolo Carlini  <pcarlini@suse.de>

        PR c++/34603
        * g++.dg/template/crash77.C: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131804 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b6593cf..d842f77 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,10 +1,17 @@
+2008-01-24  Paolo Carlini  <pcarlini@suse.de>
+
+        PR c++/34603
+        * pt.c (push_template_decl_real): Return error_mark_node in case
+       of template definition of non-template.
+
 2008-01-24  Jason Merrill  <jason@redhat.com>
 
        PR c++/34913
        * decl2.c (is_late_template_attribute): Defer any attribute with 
        dependent args.  Also defer type attributes if the type is dependent.
 
-2008-01-22  Jakub Jelinek  <jakub@redhat.com>, Alexandre Oliva  <aoliva@redhat.com>
+2008-01-22  Jakub Jelinek  <jakub@redhat.com>
+           Alexandre Oliva  <aoliva@redhat.com>
 
        PR c++/33984
        * call.c (reference_binding): For bitfields use the declared bitfield

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e61915d..56fcd4d 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1,6 +1,6 @@
 /* Handle parameterized types (templates) for GNU C++.
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2007  Free Software Foundation, Inc.
+   2001, 2002, 2003, 2004, 2005, 2007, 2008  Free Software Foundation, Inc.
    Written by Ken Raeburn (raeburn@cygnus.com) while at Watchmaker Computing.
    Rewritten by Jason Merrill (jason@cygnus.com).
 
@@ -3977,7 +3977,7 @@ push_template_decl_real (tree decl, bool is_friend)
       if (!tinfo)
        {
          error ("template definition of non-template %q#D", decl);
-         return decl;
+         return error_mark_node;
        }
 
       tmpl = TI_TEMPLATE (tinfo);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96515ab..70f1e0d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-24  Paolo Carlini  <pcarlini@suse.de>
+
+        PR c++/34603
+        * g++.dg/template/crash77.C: New.
+
 2008-01-24  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/34856

diff --git a/gcc/testsuite/g++.dg/template/crash77.C b/gcc/testsuite/g++.dg/template/crash77.C
new file mode 100644 (file)
index 0000000..b4d6e8f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash77.C
@@ -0,0 +1,5 @@
+// PR c++/34603
+
+template<typename> struct A; // { dg-error "declaration" }
+
+template<typename T> A<T>::A( struct A; // { dg-error "definition|expected|incomplete" }