decl.c (grokparms): Use cp_build_qualified_type instead TYPE_MAIN_VARIANT.

2003-08-06  Aldy Hernandez  <aldyh@redhat.com>

	* decl.c (grokparms): Use cp_build_qualified_type instead
	TYPE_MAIN_VARIANT.

[[Split portion of a mixed commit.]]

From-SVN: r70211.2

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 531d4e8..f6545a8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-06  Aldy Hernandez  <aldyh@redhat.com>
+
+       * decl.c (grokparms): Use cp_build_qualified_type instead
+       TYPE_MAIN_VARIANT.
+
 2003-08-05  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        * cxx-pretty-print.h: New file.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 503a635..9afa303 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11970,7 +11970,7 @@ grokparms (tree first_parm)
        {
          /* Top-level qualifiers on the parameters are
             ignored for function types.  */
-         type = TYPE_MAIN_VARIANT (type);
+         type = cp_build_qualified_type (type, 0);
          if (TREE_CODE (type) == METHOD_TYPE)
            {
              error ("parameter `%D' invalidly declared method type", decl);