From e022a6cb913fe7e2be222ab6954b6574a037ed4f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 19 Feb 2005 04:02:09 +0000 Subject: re PR java/20056 ('verification failed: incompatible type on stack' with --indirect-dispatch) PR java/20056: * verify-impl.c (types_equal): Fixed test. From-SVN: r95267 --- gcc/java/ChangeLog | 3 +++ gcc/java/verify-impl.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 84a0e78..c1d4808 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,6 +1,9 @@ 2005-02-18 Tom Tromey 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 376f749..bd681d2 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) -- cgit v1.1