parser.c (cp_parser_primary_expression): See through explicitly scoped ALIAS_DECLs...

        * parser.c (cp_parser_primary_expression): See through explicitly
        scoped ALIAS_DECLs, too.

From-SVN: r61054

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3435016..2376d13 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-08  Jason Merrill  <jason@redhat.com>
+
+       * parser.c (cp_parser_primary_expression): See through explicitly
+       scoped ALIAS_DECLs, too.
+
 2003-01-08  Nathanael Nerode  <neroden@gcc.gnu.org>
 
        * decl.c: ANSIfy function declarations.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index f5ada05..e88045d 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3023,14 +3023,15 @@ cp_parser_primary_expression (cp_parser *parser,
                if (TREE_CODE (decl) == FIELD_DECL || BASELINK_P (decl))
                  *qualifying_class = parser->scope;
              }
-           /* Resolve references to variables of anonymous unions
-              into COMPONENT_REFs.  */
-           else if (TREE_CODE (decl) == ALIAS_DECL)
-             decl = DECL_INITIAL (decl);
            else
              /* Transform references to non-static data members into
                 COMPONENT_REFs.  */
              decl = hack_identifier (decl, id_expression);
+
+           /* Resolve references to variables of anonymous unions
+              into COMPONENT_REFs.  */
+           if (TREE_CODE (decl) == ALIAS_DECL)
+             decl = DECL_INITIAL (decl);
          }
 
        if (TREE_DEPRECATED (decl))

diff --git a/gcc/testsuite/g++.dg/lookup/anon3.C b/gcc/testsuite/g++.dg/lookup/anon3.C
new file mode 100644 (file)
index 0000000..2523e0a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/anon3.C
@@ -0,0 +1,11 @@
+// Test that anonymous unions work with explicit scope.
+
+static union
+{
+  int i;
+};
+
+int main()
+{
+  return ::i;
+}