re PR c++/42069 (ICE on class template specialization)

Fix PR c++/42069

gcc/cp/ChangeLog:
	PR c++/42069
	* pt.c (convert_template_argument): Strip typedefs from SCOPE_REFs.

gcc/testsuite/ChangeLog:
	PR c++/42069
	* g++.dg/template/typedef23.C: New test.

From-SVN: r154768

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 57ce3cd58ffcd1946c62687b4c8409a3cc71810b..e035f3ddad70fa98c859d10ca3d52b6b9188ca21 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/42069
+       * pt.c (convert_template_argument): Strip typedefs from SCOPE_REFs.
+
 2009-11-29  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/36408

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index dd86ceeb682bc1bf7d5a589db2e5a6857ae78698..9fd06b3433fed4a9247ced36a4fe7d21fd5f86ec 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -5526,6 +5526,13 @@ convert_template_argument (tree parm,
       if (TYPE_P (val))
        val = strip_typedefs (val);
     }
+  else if (TREE_CODE (orig_arg) == SCOPE_REF)
+    {
+      /* Strip typedefs from the SCOPE_REF.  */
+      tree type = strip_typedefs (TREE_TYPE (orig_arg));
+      tree scope = strip_typedefs (TREE_OPERAND (orig_arg, 0));
+      val = build2 (SCOPE_REF, type, scope, TREE_OPERAND (orig_arg, 1));
+    }
   else
     {
       tree t = tsubst (TREE_TYPE (parm), args, complain, in_decl);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5ea107d0a09518330f36509c1ed08f9ba5ff0c2c..f09f148f3f82761714b4690fa72b32bc7722155a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/42069
+       * g++.dg/template/typedef23.C: New test.
+
 2009-11-29  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR tree-optimization/41961

diff --git a/gcc/testsuite/g++.dg/template/typedef23.C b/gcc/testsuite/g++.dg/template/typedef23.C
new file mode 100644 (file)
index 0000000..e703550
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/typedef23.C
@@ -0,0 +1,25 @@
+// Contributed by Dodji Seketeli <dodji@redhat.com>
+// Origin PR c++/42069
+// { dg-do compile }
+
+struct A
+{
+  static const int N = 0;
+};
+
+template<int> struct B {};
+
+template<typename T, int>
+struct C
+{
+  typedef T U;
+  B<U::N> b;
+};
+
+template<typename T>
+struct C<T*, 0>
+{
+  B<T::N> b;
+};
+
+C<A*, 0> c;