Skip to content

Commit e297e88

Browse files
committed
8338688: Shenandoah: Avoid calling java_lang_Class accessors in asserts/verifier
Reviewed-by: rkennke, wkemper
1 parent 0e8fe35 commit e297e88

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void ShenandoahAsserts::assert_correct(void* interior_loc, oop obj, const char*
266266
// Do additional checks for special objects: their fields can hold metadata as well.
267267
// We want to check class loading/unloading did not corrupt them.
268268

269-
if (Universe::is_fully_initialized() && java_lang_Class::is_instance(obj)) {
269+
if (Universe::is_fully_initialized() && (obj_klass == vmClasses::Class_klass())) {
270270
Metadata* klass = obj->metadata_field(java_lang_Class::klass_offset());
271271
if (klass != nullptr && !Metaspace::contains(klass)) {
272272
print_failure(_safe_all, obj, interior_loc, nullptr, "Shenandoah assert_correct failed",

src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
222222
// Do additional checks for special objects: their fields can hold metadata as well.
223223
// We want to check class loading/unloading did not corrupt them.
224224

225-
if (java_lang_Class::is_instance(obj)) {
225+
if (obj_klass == vmClasses::Class_klass()) {
226226
Metadata* klass = obj->metadata_field(java_lang_Class::klass_offset());
227227
check(ShenandoahAsserts::_safe_oop, obj,
228228
klass == nullptr || Metaspace::contains(klass),

0 commit comments

Comments
 (0)