* parse.y (nested_name_specifier_1): Pull out the TYPE_MAIN_VARIANT.

From-SVN: r21364

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7a479dd7bbc1eef6d498ea025c92371cc27999e3..127c8e9998c0c492d9f4d0a1f7b0abee1f27502d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 1998-07-24  Jason Merrill  <jason@yorick.cygnus.com>
 
+       * parse.y (nested_name_specifier_1): Pull out the TYPE_MAIN_VARIANT.
+
        * pt.c (coerce_template_parms): Also complain about local enums.
 
        * cp-tree.h: Add prototype for set_identifier_local_value.

diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c
index 085e87b372c21c4fd2aefcf87b3688dc9258ce5f..04e517f7c30bd2b762f6ace8421e814e38c84d29 100644 (file)
--- a/gcc/cp/parse.c
+++ b/gcc/cp/parse.c
@@ -6796,7 +6796,7 @@ case 623:
                          && ! IDENTIFIER_CLASS_VALUE (yyvsp[-1].ttype))
                        pushdecl_class_level (yyval.ttype);
                    }
-                 got_scope = yyval.ttype = TREE_TYPE (yyval.ttype);
+                 got_scope = yyval.ttype = TYPE_MAIN_VARIANT (TREE_TYPE (yyval.ttype));
                ;
     break;}
 case 624:

diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y
index 2dab9f0a241e739a2536f64e7a0076b3adebe542..c5acf27b22bfe3f145ec7f48d70fdebc94519d82 100644 (file)
--- a/gcc/cp/parse.y
+++ b/gcc/cp/parse.y
@@ -2897,7 +2897,7 @@ nested_name_specifier_1:
                          && ! IDENTIFIER_CLASS_VALUE ($1))
                        pushdecl_class_level ($$);
                    }
-                 got_scope = $$ = TREE_TYPE ($$);
+                 got_scope = $$ = TYPE_MAIN_VARIANT (TREE_TYPE ($$));
                }
        | SELFNAME SCOPE
                {