8288360: CI: ciInstanceKlass::implementor() is not consistent for wel…

…l-known classes Backport-of: 50f99c3208fc9f479cc109fb6e73d262e27026a2
openjdk · Jul 21, 2022 · 517a18e · 517a18e · openjdk-notifier · Jul 21, 2022
1 parent 9d8e388
commit 517a18e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/hotspot/share/ci/ciInstanceKlass.cpp b/src/hotspot/share/ci/ciInstanceKlass.cpp
@@ -601,8 +601,10 @@ bool ciInstanceKlass::is_leaf_type() {
 ciInstanceKlass* ciInstanceKlass::implementor() {
   ciInstanceKlass* impl = _implementor;
   if (impl == NULL) {
-    // Go into the VM to fetch the implementor.
-    {
+    if (is_shared()) {
+      impl = this; // assume a well-known interface never has a unique implementor
+    } else {
+      // Go into the VM to fetch the implementor.
       VM_ENTRY_MARK;
       MutexLocker ml(Compile_lock);
       Klass* k = get_instanceKlass()->implementor();
@@ -616,9 +618,7 @@ ciInstanceKlass* ciInstanceKlass::implementor() {
       }
     }
     // Memoize this result.
-    if (!is_shared()) {
-      _implementor = impl;
-    }
+    _implementor = impl;
   }
   return impl;
 }