diff options
| author | obrien <obrien@FreeBSD.org> | 2000-05-27 02:25:28 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-05-27 02:25:28 +0000 |
| commit | 890b30850f08010e6461f2af573cb7b53a82ef36 (patch) | |
| tree | b725d094db3c58a89d4ee7be9eac2c5e09532e13 /contrib/gcc/c-typeck.c | |
| parent | 89d6e979f6e51927c13633bc1c374b05a37d0238 (diff) | |
| download | FreeBSD-src-890b30850f08010e6461f2af573cb7b53a82ef36.zip FreeBSD-src-890b30850f08010e6461f2af573cb7b53a82ef36.tar.gz | |
Bring in bug fixes from the GCC anoncvs server's "gcc-2_95-branch"
branch as of May 26th, 2000. [these are changes March 31 - May 24th]
Diffstat (limited to 'contrib/gcc/c-typeck.c')
| -rw-r--r-- | contrib/gcc/c-typeck.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/gcc/c-typeck.c b/contrib/gcc/c-typeck.c index 154d830..d320307 100644 --- a/contrib/gcc/c-typeck.c +++ b/contrib/gcc/c-typeck.c @@ -5846,7 +5846,7 @@ add_pending_init (purpose, value) p = *q; if (tree_int_cst_lt (purpose, p->purpose)) q = &p->left; - else if (tree_int_cst_lt (p->purpose, purpose)) + else if (p->purpose != purpose) q = &p->right; else abort (); @@ -5860,8 +5860,7 @@ add_pending_init (purpose, value) if (tree_int_cst_lt (DECL_FIELD_BITPOS (purpose), DECL_FIELD_BITPOS (p->purpose))) q = &p->left; - else if (tree_int_cst_lt (DECL_FIELD_BITPOS (p->purpose), - DECL_FIELD_BITPOS (purpose))) + else if (p->purpose != purpose) q = &p->right; else abort (); @@ -6046,7 +6045,7 @@ pending_init_member (field) { while (p) { - if (tree_int_cst_equal (field, p->purpose)) + if (field == p->purpose) return 1; else if (tree_int_cst_lt (field, p->purpose)) p = p->left; |
