decl.c (duplicate_decls): Use CANONICAL_TYPE_VARIANT to compare old and new types.

	* decl.c (duplicate_decls): Use CANONICAL_TYPE_VARIANT to compare
	old and new types.

From-SVN: r19816

gcc/cp/ChangeLog

 Sun May 17 12:32:08 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
+	* decl.c (duplicate_decls): Use CANONICAL_TYPE_VARIANT to compare
+	old and new types.
+
 	* pt.c (tsubst): Make sure that BINFO_TYPE of new binfos is the
 	canonical type.
 

gcc/cp/decl.c

@@ -2926,7 +2926,7 @@ duplicate_decls (newdecl, olddecl)
       TREE_TYPE (newdecl) = TREE_TYPE (olddecl) = newtype;
 
       /* Lay the type out, unless already done.  */
-      if (oldtype != TREE_TYPE (newdecl)
+      if (newtype != CANONICAL_TYPE_VARIANT (oldtype)
 	  && TREE_TYPE (newdecl) != error_mark_node
 	  && !(processing_template_decl && uses_template_parms (newdecl)))
 	layout_type (TREE_TYPE (newdecl));