diff -r 470af058bd5f -r 4932dce35882 src/hotspot/share/oops/instanceKlass.cpp --- a/src/hotspot/share/oops/instanceKlass.cpp Tue Sep 17 09:51:02 2019 +0200 +++ b/src/hotspot/share/oops/instanceKlass.cpp Tue Sep 17 09:51:02 2019 +0200 @@ -2717,7 +2717,7 @@ // and package entries. Both must be the same. This rule // applies even to classes that are defined in the unnamed // package, they still must have the same class loader. - if (oopDesc::equals(classloader1, classloader2) && (classpkg1 == classpkg2)) { + if ((classloader1 == classloader2) && (classpkg1 == classpkg2)) { return true; } @@ -2728,7 +2728,7 @@ // and classname information is enough to determine a class's package bool InstanceKlass::is_same_class_package(oop other_class_loader, const Symbol* other_class_name) const { - if (!oopDesc::equals(class_loader(), other_class_loader)) { + if (class_loader() != other_class_loader) { return false; } if (name()->fast_compare(other_class_name) == 0) {