OSDN Git Service

PR c++/28058
authormmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 27 Aug 2006 17:45:25 +0000 (17:45 +0000)
committermmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 27 Aug 2006 17:45:25 +0000 (17:45 +0000)
* pt.c (register_specialization): Return error_mark_node for
specialization-after-instantiation.
* decl2.c (mark_used): Mark the main function used when one of its
clones is used.

PR c++/28058
* g++.dg/template/spec31.C: New test.

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

gcc/cp/ChangeLog
gcc/cp/decl2.c
gcc/cp/pt.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/template/spec31.C [new file with mode: 0644]

index dd1df56..369a678 100644 (file)
@@ -1,3 +1,11 @@
+2006-08-27  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/28058
+       * pt.c (register_specialization): Return error_mark_node for
+       specialization-after-instantiation.
+       * decl2.c (mark_used): Mark the main function used when one of its
+       clones is used.
+       
 2006-08-27  Lee Millward  <lee.millward@codesourcery.com>
 
         PR c++/26573
index db1e917..a6187e2 100644 (file)
@@ -3494,6 +3494,8 @@ mark_used (tree decl)
     }
 
   TREE_USED (decl) = 1;
+  if (DECL_CLONED_FUNCTION_P (decl))
+    TREE_USED (DECL_CLONED_FUNCTION (decl)) = 1;
   /* If we don't need a value, then we don't need to synthesize DECL.  */
   if (skip_evaluation)
     return;
index 5e0c954..17557c0 100644 (file)
@@ -1163,7 +1163,7 @@ register_specialization (tree spec, tree tmpl, tree args, bool is_friend)
            {
              error ("specialization of %qD after instantiation",
                     fn);
-             return spec;
+             return error_mark_node;
            }
          else
            {
index c6d6457..dd2456b 100644 (file)
@@ -1,3 +1,8 @@
+2006-08-27  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/28058
+       * g++.dg/template/spec31.C: New test.
+
 2006-08-27  Lee Millward  <lee.millward@codesourcery.com>
 
         PR c++/26573
diff --git a/gcc/testsuite/g++.dg/template/spec31.C b/gcc/testsuite/g++.dg/template/spec31.C
new file mode 100644 (file)
index 0000000..3b36ab4
--- /dev/null
@@ -0,0 +1,10 @@
+// PR c++/28058
+
+template<int> struct A
+{
+  A() {}
+};
+
+A<0> a;
+
+template<> A<0>::A() {} // { dg-error "specialization" }