PR c++/85587 - error with scoped enum in template.

	* semantics.c (finish_qualified_id_expr): Don't return an
	unqualified IDENTIFIER_NODE.

From-SVN: r259805

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3453df8aa184a641670aba47280dd21bc755fa39..604e704fb2c394ef0fad0f7a987b237c90b39d3a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-01  Jason Merrill  <jason@redhat.com>
+
+       PR c++/85587 - error with scoped enum in template.
+       * semantics.c (finish_qualified_id_expr): Don't return an
+       unqualified IDENTIFIER_NODE.
+
 2018-04-30  Jason Merrill  <jason@redhat.com>
 
        PR c++/85580 - extern "C" and local variables

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 8c893ed64b0098a7a262379610c37e636ac3f511..4568bb96f3b22104c184e395dc65264fe5626ecf 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2061,7 +2061,8 @@ finish_qualified_id_expr (tree qualifying_class,
     }
 
   /* No need to check access within an enum.  */
-  if (TREE_CODE (qualifying_class) == ENUMERAL_TYPE)
+  if (TREE_CODE (qualifying_class) == ENUMERAL_TYPE
+      && TREE_CODE (expr) != IDENTIFIER_NODE)
     return expr;
 
   /* Within the scope of a class, turn references to non-static

diff --git a/gcc/testsuite/g++.dg/cpp0x/scoped_enum8.C b/gcc/testsuite/g++.dg/cpp0x/scoped_enum8.C
new file mode 100644 (file)
index 0000000..3bd6639
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/scoped_enum8.C
@@ -0,0 +1,25 @@
+// PR c++/85587
+// { dg-do compile { target c++11 } }
+
+template <int N>
+struct S
+{
+  enum class T
+  {
+    E, F
+  };
+  void foo ();
+};
+
+template <int N>
+void S<N>::foo ()
+{
+  decltype (T::F) t;
+}
+
+void
+bar ()
+{
+  S<0> s;
+  s.foo ();
+}