PR c++/77339 - ICE with invalid use of alias template.

	* pt.c (lookup_template_class_1): Don't try to enter the scope of an
	alias template.

From-SVN: r246462

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f8e711b160a47cefc53f6713ee70f782c27925f1..ea1eaa771a5b450e581bc9295d579cae009ba3e5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-24  Jason Merrill  <jason@redhat.com>
+
+       PR c++/77339 - ICE with invalid use of alias template.
+       * pt.c (lookup_template_class_1): Don't try to enter the scope of an
+       alias template.
+
 2017-03-24  Marek Polacek  <polacek@redhat.com>
 
        PR c++/80119

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 5259dad72a075df76194b7479d6e7a2abebef96b..cbe80821b54ffa7a7a7f7f937564acedeb7c28c8 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8682,9 +8682,9 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
          || !PRIMARY_TEMPLATE_P (gen_tmpl)
          || currently_open_class (template_type))
        {
-         tree tinfo = TYPE_TEMPLATE_INFO_MAYBE_ALIAS (template_type);
+         tree tinfo = TYPE_TEMPLATE_INFO (template_type);
 
-         if (comp_template_args (TI_ARGS (tinfo), arglist))
+         if (tinfo && comp_template_args (TI_ARGS (tinfo), arglist))
            return template_type;
        }
 

diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-58.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-58.C
new file mode 100644 (file)
index 0000000..0ae1c49
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-58.C
@@ -0,0 +1,7 @@
+// PR c++/77339
+// { dg-do compile { target c++11 } }
+
+template < typename > using A = int;
+
+//OK: template < typename X > A < X > a; 
+template < typename X > A < X >::a; // { dg-error "" }