From 64124b5201734cdafdba284665c4b3fd12197e66 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Thu, 7 May 2026 08:26:14 +0000
Subject: [PATCH] 8383910: klass_or_null_acquire asserts on null when using
 compact object headers

Reviewed-by: jsjolen, mdoerr, shade, tschatzl
---
 src/hotspot/share/oops/oop.inline.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index d5cb80e1122..84327aaee39 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -119,7 +119,7 @@ Klass* oopDesc::klass_or_null() const {
 Klass* oopDesc::klass_or_null_acquire() const {
   switch (ObjLayout::klass_mode()) {
     case ObjLayout::Compact:
-      return mark_acquire().klass();
+      return mark_acquire().klass_or_null();
     case ObjLayout::Compressed: {
       narrowKlass narrow_klass = AtomicAccess::load_acquire(&_compressed_klass);
       return CompressedKlassPointers::decode(narrow_klass);