From 3360ce37c6c2cc66a9f8fdba4e84629ee8d44c73 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratochvil@openjdk.org>
Date: Thu, 9 Oct 2025 20:58:35 +0800
Subject: [PATCH] Revert "8369021: A crash in ConstantPool::klass_at_impl"

This reverts commit 026fcb1b21729e41524169c7f78855e8794ddae2.
---
 src/hotspot/share/prims/jvm.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index bb99ed4f163..ade9b45e2eb 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -1326,13 +1326,10 @@ JVM_ENTRY(jclass, JVM_GetDeclaringClass(JNIEnv *env, jclass ofClass))
   if (!klass->is_instance_klass()) {
     return nullptr;
   }
-  InstanceKlass* k = InstanceKlass::cast(klass);
-
-  // Ensure class is linked
-  k->link_class(CHECK_NULL);
 
   bool inner_is_member = false;
-  Klass* outer_klass = k->compute_enclosing_class(&inner_is_member, CHECK_NULL);
+  Klass* outer_klass
+    = InstanceKlass::cast(klass)->compute_enclosing_class(&inner_is_member, CHECK_NULL);
   if (outer_klass == nullptr)  return nullptr;  // already a top-level class
   if (!inner_is_member)  return nullptr;     // a hidden class (inside a method)
   return (jclass) JNIHandles::make_local(THREAD, outer_klass->java_mirror());
@@ -1350,10 +1347,6 @@ JVM_ENTRY(jstring, JVM_GetSimpleBinaryName(JNIEnv *env, jclass cls))
     return nullptr;
   }
   InstanceKlass* k = InstanceKlass::cast(klass);
-
-  // Ensure class is linked
-  k->link_class(CHECK_NULL);
-
   int ooff = 0, noff = 0;
   if (k->find_inner_classes_attr(&ooff, &noff, THREAD)) {
     if (noff != 0) {