Backport e297e8817f486e4af850c97fcff859c3e9a9e21c

earthling-amzn · Oct 15, 2024 · a86ee2a · a86ee2a
1 parent 520fb4e
commit a86ee2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
@@ -257,7 +257,7 @@ void ShenandoahAsserts::assert_correct(void* interior_loc, oop obj, const char*
   // Do additional checks for special objects: their fields can hold metadata as well.
   // We want to check class loading/unloading did not corrupt them.
 
-  if (java_lang_Class::is_instance(obj)) {
+  if (obj_klass == vmClasses::Class_klass()) {
     Metadata* klass = obj->metadata_field(java_lang_Class::klass_offset());
     if (klass != nullptr && !Metaspace::contains(klass)) {
       print_failure(_safe_all, obj, interior_loc, nullptr, "Shenandoah assert_correct failed",

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -239,7 +239,7 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
     // Do additional checks for special objects: their fields can hold metadata as well.
     // We want to check class loading/unloading did not corrupt them.
 
-    if (java_lang_Class::is_instance(obj)) {
+    if (obj_klass == vmClasses::Class_klass()) {
       Metadata* klass = obj->metadata_field(java_lang_Class::klass_offset());
       check(ShenandoahAsserts::_safe_oop, obj,
             klass == nullptr || Metaspace::contains(klass),