aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@gcc.gnu.org>2000-12-28 04:33:53 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2000-12-28 04:33:53 +0000
commit867e24ad3d3190a4b7b54bc8665d1066907d4079 (patch)
treef8237725affbc8d1fb5456042889a0fbd629927a /libjava/java
parent6385a28ffb2146ff1e7c34d9dc6ba8fdc7640d7f (diff)
downloadgcc-867e24ad3d3190a4b7b54bc8665d1066907d4079.zip
gcc-867e24ad3d3190a4b7b54bc8665d1066907d4079.tar.gz
gcc-867e24ad3d3190a4b7b54bc8665d1066907d4079.tar.bz2
natClass.cc (_Jv_IsAssignableFrom): Primitive TYPEs can not be assigned to Object.
* java/lang/natClass.cc (_Jv_IsAssignableFrom): Primitive TYPEs can not be assigned to Object. From-SVN: r38505
Diffstat (limited to 'libjava/java')
-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 2eec179f..4d45d07 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;