From 095e769f47682efe4e34bb46c0da2c5a2e283a7f Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 29 Nov 2024 09:55:29 +0000
Subject: [PATCH] 8345237: 32-bit Zero builds fail with assert(has_klass_gap())
 failed: precondition

Reviewed-by: mli, jwaters, rkennke
---
 src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
index fa572537c2f..3f3632c0eea 100644
--- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
+++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
@@ -2013,7 +2013,9 @@ run:
                 oopDesc::release_set_mark(result, ik->prototype_header());
               } else {
                 oopDesc::set_mark(result, markWord::prototype());
-                oopDesc::set_klass_gap(result, 0);
+                if (oopDesc::has_klass_gap()) {
+                  oopDesc::set_klass_gap(result, 0);
+                }
                 oopDesc::release_set_klass(result, ik);
               }
               oop obj = cast_to_oop(result);