FIxed an IMA bug showed up in parse and gzip.

OKed by Richard Henderson.

From-SVN: r88312

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de736348ede45f32e60830988a3738a827e20e76..a99fd42a0030cc14998d25b9b912dab2819bb7ca 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-29  Fariborz Jahanian <fjahanian@apple.com>
+
+       * c-decl.c (merge_decls): Use comptype when comparing
+       types to decide on DECL_SIZE save of olddecl.
+
 2004-09-29  Daniel Berlin  <dberlin@dberlin.org>
 
        * tree.h (INDIRECT_REF_P): New macro.

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 38a13fd201ccc855e5a4d8dc85cbc817a95e069a..5ef46b0eb8f3ffefec24489bb8ed4663f09b72fa 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1549,7 +1549,7 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
     = composite_type (newtype, oldtype);
 
   /* Lay the type out, unless already done.  */
-  if (oldtype != TREE_TYPE (newdecl))
+  if (!comptypes (oldtype, TREE_TYPE (newdecl)))
     {
       if (TREE_TYPE (newdecl) != error_mark_node)
        layout_type (TREE_TYPE (newdecl));