From 5ee367d9be2d58f575deaca9096a09387ba90b40 Mon Sep 17 00:00:00 2001 From: bothner Date: Thu, 24 Jan 2002 20:02:21 +0000 Subject: [PATCH] * verify.cc (is_assignable_from_slow): If source is an interface, we must also check the superclass. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49189 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/verify.cc | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 210c09a..cb48b1b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-01-24 Per Bothner + + * verify.cc (is_assignable_from_slow): If source is an interface, + we must also check the the superclass. + 2002-01-24 Tom Tromey * gnu/awt/xlib/XToolkit.java (getPrintJob): New stub method. diff --git a/libjava/verify.cc b/libjava/verify.cc index 8627de5..3b033c7 100644 --- a/libjava/verify.cc +++ b/libjava/verify.cc @@ -261,7 +261,9 @@ private: if (is_assignable_from_slow (target, source->interfaces[i])) return true; } - return false; + source = source->getSuperclass (); + if (source == NULL) + return false; } else if (target == &java::lang::Object::class$) return true; -- 2.7.4