diff options
| author | fjahanian <fjahanian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-30 00:09:42 +0000 |
|---|---|---|
| committer | fjahanian <fjahanian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-30 00:09:42 +0000 |
| commit | dd078265e0189262b085af631d908c818f61440c (patch) | |
| tree | b797ae90c091ed3d3a3d7d09274437695aa02946 | |
| parent | 2a448a75977eff59621b7ffeaa8ab66bb47bcf9d (diff) | |
| download | gcc-dd078265e0189262b085af631d908c818f61440c.tar.gz | |
FIxed an IMA bug showed up in parse and gzip.
OKed by Richard Henderson.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88312 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-decl.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de736348ede..a99fd42a003 100644 --- 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 38a13fd201c..5ef46b0eb8f 100644 --- 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)); |