Patchwork C++ PATCH for DR 1004 (use of injected type name as template)

login
register
mail settings
Submitter Jason Merrill
Date Nov. 17, 2010, 1:33 a.m.
Message ID <4CE330E9.3010208@redhat.com>
Download mbox | patch
Permalink /patch/71501/
State New
Headers show

Comments

Jason Merrill - Nov. 17, 2010, 1:33 a.m.
While I was doing the standardese drafting for core language issue 1004, 
I noticed that when I implemented these semantics before I missed a 
case.  Fixed thus.

Tested x86_64-pc-linux-gnu, applied to trunk.
commit 086ac7e09768d54b4fea6f936593d9e16f1f38ca
Author: Jason Merrill <jason@redhat.com>
Date:   Wed Nov 10 23:59:55 2010 -0600

    	DR 1004
    	* decl.c (make_unbound_class_template): Handle using
    	injected-type-name as template.

Patch

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 714516e..55e0d6a 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3227,6 +3227,9 @@  make_unbound_class_template (tree context, tree name, tree parm_list,
       if (MAYBE_CLASS_TYPE_P (context))
 	tmpl = lookup_field (context, name, 0, false);
 
+      if (tmpl && TREE_CODE (tmpl) == TYPE_DECL)
+	tmpl = maybe_get_template_decl_from_type_decl (tmpl);
+
       if (!tmpl || !DECL_CLASS_TEMPLATE_P (tmpl))
 	{
 	  if (complain & tf_error)
diff --git a/gcc/testsuite/g++.dg/template/injected2.C b/gcc/testsuite/g++.dg/template/injected2.C
new file mode 100644
index 0000000..bd09ccc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/injected2.C
@@ -0,0 +1,9 @@ 
+// DR 1004
+
+template <class T, template<class>class U = T::template B> struct A { };
+
+template <class T> struct B {
+  template <class U> friend struct B;
+};
+
+A<B<int> > a;