src/hotspot/share/classfile/javaClasses.cpp

roman_version

*** 870,880 ****
        set_module(mirror(), javabase_handle());
      }
    } else {
      assert(Universe::is_module_initialized() ||
             (ModuleEntryTable::javabase_defined() &&
!             (module() == ModuleEntryTable::javabase_moduleEntry()->module())),
             "Incorrect java.lang.Module specification while creating mirror");
      set_module(mirror(), module());
    }
  }
  
--- 870,880 ----
        set_module(mirror(), javabase_handle());
      }
    } else {
      assert(Universe::is_module_initialized() ||
             (ModuleEntryTable::javabase_defined() &&
!             (oopDesc::equals(module(), ModuleEntryTable::javabase_moduleEntry()->module()))),
             "Incorrect java.lang.Module specification while creating mirror");
      set_module(mirror(), module());
    }
  }
  
***************
*** 947,957 ****
          return;
        }
      }
  
      // set the classLoader field in the java_lang_Class instance
!     assert(class_loader() == k->class_loader(), "should be same");
      set_class_loader(mirror(), class_loader());
  
      // Setup indirection from klass->mirror
      // after any exceptions can happen during allocations.
      k->set_java_mirror(mirror);
--- 947,957 ----
          return;
        }
      }
  
      // set the classLoader field in the java_lang_Class instance
!     assert(oopDesc::equals(class_loader(), k->class_loader()), "should be same");
      set_class_loader(mirror(), class_loader());
  
      // Setup indirection from klass->mirror
      // after any exceptions can happen during allocations.
      k->set_java_mirror(mirror);
***************
*** 1461,1473 ****
    BasicType type = T_VOID;
    if (ak != NULL) {
      // Note: create_basic_type_mirror above initializes ak to a non-null value.
      type = ArrayKlass::cast(ak)->element_type();
    } else {
!     assert(java_class == Universe::void_mirror(), "only valid non-array primitive");
    }
!   assert(Universe::java_mirror(type) == java_class, "must be consistent");
    return type;
  }
  
  BasicType java_lang_Class::as_BasicType(oop java_class, Klass** reference_klass) {
    assert(java_lang_Class::is_instance(java_class), "must be a Class object");
--- 1461,1473 ----
    BasicType type = T_VOID;
    if (ak != NULL) {
      // Note: create_basic_type_mirror above initializes ak to a non-null value.
      type = ArrayKlass::cast(ak)->element_type();
    } else {
!     assert(oopDesc::equals(java_class, Universe::void_mirror()), "only valid non-array primitive");
    }
!   assert(oopDesc::equals(Universe::java_mirror(type), java_class), "must be consistent");
    return type;
  }
  
  BasicType java_lang_Class::as_BasicType(oop java_class, Klass** reference_klass) {
    assert(java_lang_Class::is_instance(java_class), "must be a Class object");
***************
*** 3836,3853 ****
    }
    return name;
  }
  
  bool java_lang_invoke_MethodType::equals(oop mt1, oop mt2) {
!   if (mt1 == mt2)
      return true;
!   if (rtype(mt1) != rtype(mt2))
      return false;
    if (ptype_count(mt1) != ptype_count(mt2))
      return false;
    for (int i = ptype_count(mt1) - 1; i >= 0; i--) {
!     if (ptype(mt1, i) != ptype(mt2, i))
        return false;
    }
    return true;
  }
  
--- 3836,3853 ----
    }
    return name;
  }
  
  bool java_lang_invoke_MethodType::equals(oop mt1, oop mt2) {
!   if (oopDesc::equals(mt1, mt2))
      return true;
!   if (!oopDesc::equals(rtype(mt1), rtype(mt2)))
      return false;
    if (ptype_count(mt1) != ptype_count(mt2))
      return false;
    for (int i = ptype_count(mt1) - 1; i >= 0; i--) {
!     if (!oopDesc::equals(ptype(mt1, i), ptype(mt2, i)))
        return false;
    }
    return true;
  }
  
***************
*** 4041,4051 ****
    oop acl = loader;
    debug_only(jint loop_count = 0);
    // This loop taken verbatim from ClassLoader.java:
    do {
      acl = parent(acl);
!     if (cl == acl) {
        return true;
      }
      assert(++loop_count > 0, "loop_count overflow");
    } while (acl != NULL);
    return false;
--- 4041,4051 ----
    oop acl = loader;
    debug_only(jint loop_count = 0);
    // This loop taken verbatim from ClassLoader.java:
    do {
      acl = parent(acl);
!     if (oopDesc::equals(cl, acl)) {
        return true;
      }
      assert(++loop_count > 0, "loop_count overflow");
    } while (acl != NULL);
    return false;
***************
*** 4071,4081 ****
    // Fix for 4474172; see evaluation for more details
    loader = non_reflection_class_loader(loader);
  
    oop cl = SystemDictionary::java_system_loader();
    while(cl != NULL) {
!     if (cl == loader) return true;
      cl = parent(cl);
    }
    return false;
  }
  
--- 4071,4081 ----
    // Fix for 4474172; see evaluation for more details
    loader = non_reflection_class_loader(loader);
  
    oop cl = SystemDictionary::java_system_loader();
    while(cl != NULL) {
!     if (oopDesc::equals(cl, loader)) return true;
      cl = parent(cl);
    }
    return false;
  }