diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-19 04:02:09 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-19 04:02:09 +0000 |
| commit | e60a325a6fa02d7f10f461206bf09689bf522dd7 (patch) | |
| tree | 533752e286d83b7e4b6a2018b64dc241a6560196 /gcc/java | |
| parent | fa8f03c4c92d2f2b4c1edce23065edaab03600a7 (diff) | |
| download | gcc-e60a325a6fa02d7f10f461206bf09689bf522dd7.tar.gz | |
PR java/20056:
* verify-impl.c (types_equal): Fixed test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95267 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/java/verify-impl.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 84a0e78af1c..c1d48086be9 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,6 +1,9 @@ 2005-02-18 Tom Tromey <tromey@redhat.com> PR java/20056: + * verify-impl.c (types_equal): Fixed test. + + PR java/20056: * verify-glue.c (vfy_class_has_field): New function. * verify.h (vfy_class_has_field): Declare. * verify-impl.c (check_field_constant): Added 'putfield' diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c index 376f7494860..bd681d2bce0 100644 --- a/gcc/java/verify-impl.c +++ b/gcc/java/verify-impl.c @@ -743,8 +743,9 @@ types_compatible (type *t, type *k) static bool types_equal (type *t1, type *t2) { - if (t1->key != reference_type || t1->key != uninitialized_reference_type - || t2->key != reference_type || t2->key != uninitialized_reference_type) + if ((t1->key != reference_type && t1->key != uninitialized_reference_type) + || (t2->key != reference_type + && t2->key != uninitialized_reference_type)) return false; /* Only single-ref types are allowed. */ if (t1->klass->ref_next || t2->klass->ref_next) |