src/hotspot/share/prims/jni.cpp

roman_version

*** 581,591 ****
  
    oop sub_mirror   = JNIHandles::resolve_non_null(sub);
    oop super_mirror = JNIHandles::resolve_non_null(super);
    if (java_lang_Class::is_primitive(sub_mirror) ||
        java_lang_Class::is_primitive(super_mirror)) {
!     jboolean ret = (sub_mirror == super_mirror);
  
      HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN(ret);
      return ret;
    }
    Klass* sub_klass   = java_lang_Class::as_Klass(sub_mirror);
--- 581,591 ----
  
    oop sub_mirror   = JNIHandles::resolve_non_null(sub);
    oop super_mirror = JNIHandles::resolve_non_null(super);
    if (java_lang_Class::is_primitive(sub_mirror) ||
        java_lang_Class::is_primitive(super_mirror)) {
!     jboolean ret = oopDesc::equals(sub_mirror, super_mirror);
  
      HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN(ret);
      return ret;
    }
    Klass* sub_klass   = java_lang_Class::as_Klass(sub_mirror);
***************
*** 821,831 ****
  
    HOTSPOT_JNI_ISSAMEOBJECT_ENTRY(env, r1, r2);
  
    oop a = JNIHandles::resolve(r1);
    oop b = JNIHandles::resolve(r2);
!   jboolean ret = (a == b) ? JNI_TRUE : JNI_FALSE;
  
    HOTSPOT_JNI_ISSAMEOBJECT_RETURN(ret);
    return ret;
  JNI_END
  
--- 821,831 ----
  
    HOTSPOT_JNI_ISSAMEOBJECT_ENTRY(env, r1, r2);
  
    oop a = JNIHandles::resolve(r1);
    oop b = JNIHandles::resolve(r2);
!   jboolean ret = oopDesc::equals(a, b) ? JNI_TRUE : JNI_FALSE;
  
    HOTSPOT_JNI_ISSAMEOBJECT_RETURN(ret);
    return ret;
  JNI_END