re PR c++/70067 (internal compiler error: in strip_typedefs, at cp/tree.c:1466)

	PR c++/70067

	* tree.c (strip_typedefs): Handle TYPENAME_TYPE lookup finding the
	same type.

From-SVN: r233973

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5f6d69a4622aca62b4371a091b72e3423c8ced3a..0f23bd770b71232c57e73af1fca44028821c62d1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-04  Jason Merrill  <jason@redhat.com>
+
+       PR c++/70067
+       * tree.c (strip_typedefs): Handle TYPENAME_TYPE lookup finding the
+       same type.
+
 2016-03-03  Jason Merrill  <jason@redhat.com>
 
        * method.c (synthesized_method_walk): operator= can also be constexpr.

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 0b7b1443b609f2f549a1e85f1e44d6d14600a79a..aaf9a4f2188ae27e22c9cd67262cfb1706c5e760 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1437,6 +1437,9 @@ strip_typedefs (tree t, bool *remove_attributes)
        result = make_typename_type (strip_typedefs (TYPE_CONTEXT (t),
                                                     remove_attributes),
                                     fullname, typename_type, tf_none);
+       /* Handle 'typedef typename A::N N;'  */
+       if (typedef_variant_p (result))
+         result = TYPE_MAIN_VARIANT (DECL_ORIGINAL_TYPE (TYPE_NAME (result)));
       }
       break;
     case DECLTYPE_TYPE:

diff --git a/gcc/testsuite/g++.dg/template/typename21.C b/gcc/testsuite/g++.dg/template/typename21.C
new file mode 100644 (file)
index 0000000..e5e59b1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/typename21.C
@@ -0,0 +1,11 @@
+// PR c++/70067
+// { dg-do compile { target c++98 } }
+
+template <class> struct A;
+template <class T> struct B { struct N { }; };
+template <class T> struct D: B<T> {
+  typedef typename D::N N;
+  A<N> *a;
+};
+
+D<int> d;