From: Jason Merrill <jason@redhat.com>
Date: Fri, 17 Feb 2017 20:28:38 +0000 (-0500)
Subject: PR c++/78690 - ICE with using and global type with same name
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c5867495bbfce161cd0461b002f626f9339b78f;p=gcc.git

PR c++/78690 - ICE with using and global type with same name

	* pt.c (type_dependent_object_expression_p): True for
	IDENTIFIER_NODE.

From-SVN: r245549
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a660c434c79..2e2cd6c48c5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2017-02-17  Jason Merrill  <jason@redhat.com>
 
+	PR c++/78690 - ICE with using and global type with same name
+	* pt.c (type_dependent_object_expression_p): True for
+	IDENTIFIER_NODE.
+
 	PR c++/79549 - C++17 ICE with non-type auto template parameter pack
 	* pt.c (convert_template_argument): Just return an auto arg pack.
 	(tsubst_template_args): Don't tsubst an auto pack type.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 04479d4d486..9e6ce8d51de 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -23932,6 +23932,10 @@ type_dependent_expression_p (tree expression)
 bool
 type_dependent_object_expression_p (tree object)
 {
+  /* An IDENTIFIER_NODE can sometimes have a TREE_TYPE, but it's still
+     dependent.  */
+  if (TREE_CODE (object) == IDENTIFIER_NODE)
+    return true;
   tree scope = TREE_TYPE (object);
   return (!scope || dependent_scope_p (scope));
 }
diff --git a/gcc/testsuite/g++.dg/template/dependent-scope1.C b/gcc/testsuite/g++.dg/template/dependent-scope1.C
new file mode 100644
index 00000000000..a5c18c4629c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/dependent-scope1.C
@@ -0,0 +1,17 @@
+// PR c++/78690
+
+struct C;
+
+template <typename T>
+struct A
+{
+  struct C { static void bar (); };
+};
+
+template <typename T>
+struct B
+{
+  using A<T>::C;
+  void
+  foo () { C.bar (); }
+};