tree.c (cp_build_qualified_type_real): If we're asking for the same quals we already...

	* tree.c (cp_build_qualified_type_real): If we're asking for the
	same quals we already have, just return.

From-SVN: r28886

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 72cc6a5629ea2a5413e894f145cef6911f298a56..3395ca971b2d55c097eabbdb1fd4da30a64fadfe 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-25  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * tree.c (cp_build_qualified_type_real): If we're asking for the
+       same quals we already have, just return.
+
 1999-08-25  Mark Mitchell  <mark@codesourcery.com>
 
        * cp-tree.def (SUBOBJECT): New tree node.

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 860dd0fffda3a8f9bb2b347ca79c6cc206ac9d99..8c1ff3f171aa90653fa0fea14fc19e803185335f 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -508,7 +508,10 @@ cp_build_qualified_type_real (type, type_quals, complain)
 
   if (type == error_mark_node)
     return type;
-  
+
+  if (type_quals == TYPE_QUALS (type))
+    return type;
+
   /* A restrict-qualified pointer type must be a pointer (or reference)
      to object or incomplete type.  */
   if ((type_quals & TYPE_QUAL_RESTRICT)