--- a/src/hotspot/share/classfile/javaClasses.cpp Tue Sep 17 09:51:02 2019 +0200
+++ b/src/hotspot/share/classfile/javaClasses.cpp Tue Sep 17 09:51:02 2019 +0200
@@ -878,7 +878,7 @@
} else {
assert(Universe::is_module_initialized() ||
(ModuleEntryTable::javabase_defined() &&
- (oopDesc::equals(module(), ModuleEntryTable::javabase_moduleEntry()->module()))),
+ (module() == ModuleEntryTable::javabase_moduleEntry()->module())),
"Incorrect java.lang.Module specification while creating mirror");
set_module(mirror(), module());
}
@@ -955,7 +955,7 @@
}
// set the classLoader field in the java_lang_Class instance
- assert(oopDesc::equals(class_loader(), k->class_loader()), "should be same");
+ assert(class_loader() == k->class_loader(), "should be same");
set_class_loader(mirror(), class_loader());
// Setup indirection from klass->mirror
@@ -1510,9 +1510,9 @@
// 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(java_class == Universe::void_mirror(), "only valid non-array primitive");
}
- assert(oopDesc::equals(Universe::java_mirror(type), java_class), "must be consistent");
+ assert(Universe::java_mirror(type) == java_class, "must be consistent");
return type;
}
@@ -3712,14 +3712,14 @@
}
bool java_lang_invoke_MethodType::equals(oop mt1, oop mt2) {
- if (oopDesc::equals(mt1, mt2))
+ if (mt1 == mt2)
return true;
- if (!oopDesc::equals(rtype(mt1), rtype(mt2)))
+ 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 (!oopDesc::equals(ptype(mt1, i), ptype(mt2, i)))
+ if (ptype(mt1, i) != ptype(mt2, i))
return false;
}
return true;
@@ -3933,7 +3933,7 @@
// This loop taken verbatim from ClassLoader.java:
do {
acl = parent(acl);
- if (oopDesc::equals(cl, acl)) {
+ if (cl == acl) {
return true;
}
assert(++loop_count > 0, "loop_count overflow");
@@ -3963,7 +3963,7 @@
oop cl = SystemDictionary::java_system_loader();
while(cl != NULL) {
- if (oopDesc::equals(cl, loader)) return true;
+ if (cl == loader) return true;
cl = parent(cl);
}
return false;