summaryrefslogtreecommitdiffstats
path: root/libjava/java/lang/natClass.cc
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2000-12-28 04:33:53 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2000-12-28 04:33:53 +0000
commit680abc87618a3632f18ac2141626fbd6f05dc93e (patch)
treef8237725affbc8d1fb5456042889a0fbd629927a /libjava/java/lang/natClass.cc
parent7e15618b938fa746b39c60463e07fbd3eacfbb39 (diff)
downloadppe42-gcc-680abc87618a3632f18ac2141626fbd6f05dc93e.tar.gz
ppe42-gcc-680abc87618a3632f18ac2141626fbd6f05dc93e.zip
* java/lang/natClass.cc (_Jv_IsAssignableFrom): Primitive TYPEs can
not be assigned to Object. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38505 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang/natClass.cc')
-rw-r--r--libjava/java/lang/natClass.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 2eec179fa64..4d45d07e39c 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -909,8 +909,8 @@ _Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, int method_idx)
jboolean
_Jv_IsAssignableFrom (jclass target, jclass source)
{
- if (target == &ObjectClass
- || source == target
+ if (source == target
+ || (target == &ObjectClass && !source->isPrimitive())
|| (source->ancestors != NULL
&& source->ancestors[source->depth - target->depth] == target))
return true;
OpenPOWER on IntegriCloud