diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3435016603ecbdda6392870b1d0c62589a46905e..2376d13948de153ae410f0b05eb238840c58d7a0 100644 --- 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 f5ada05c0e4925e4697532284e43af28affb5920..e88045dc117c09e31a71ff3cb68faf08ed1b6051 100644 --- 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 index 0000000000000000000000000000000000000000..2523e0a7dd5f75f64a58077c5421c58df694e28d --- /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; +}