diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/spec31.C | 10 |
5 files changed, 26 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dd1df56fca4..369a678036a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index db1e9179a2b..a6187e28006 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -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; diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5e0c9541b9a..17557c0fffa 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -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 { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c6d64573eae..dd2456b89c7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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 index 00000000000..3b36ab486ad --- /dev/null +++ b/gcc/testsuite/g++.dg/template/spec31.C @@ -0,0 +1,10 @@ +// PR c++/28058 + +template<int> struct A +{ + A() {} +}; + +A<0> a; + +template<> A<0>::A() {} // { dg-error "specialization" } |