Rely only on extentLocalCache and scopedLocalCache presence

Rely on extentLocalCache and scopedLocalCache presence for substituting setExtentLocalCache and setScopedLocalCache, as these methods are tightly coupled.
oracle · Jan 20, 2023 · cb727c4 · cb727c4
1 parent b6d364e
commit cb727c4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 99 deletions.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/HasSetExtentLocalCache.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/HasSetExtentLocalCache.java
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/HasSetScopedValueCache.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/HasSetScopedValueCache.java
diff --git a/...atevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java b/...atevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java
@@ -53,8 +53,6 @@
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.jdk.ContinuationsNotSupported;
 import com.oracle.svm.core.jdk.ContinuationsSupported;
-import com.oracle.svm.core.jdk.HasSetExtentLocalCache;
-import com.oracle.svm.core.jdk.HasSetScopedValueCache;
 import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK17OrEarlier;
 import com.oracle.svm.core.jdk.JDK17OrLater;
@@ -186,7 +184,7 @@ public final class Target_java_lang_Thread {
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
     Object lockHelper;
 
-    @Inject @TargetElement(onlyWith = {HasSetScopedValueCache.class, HasScopedValueCache.class, HasSetExtentLocalCache.class, HasExtentLocalCache.class, LoomJDK.class}) //
+    @Inject @TargetElement(onlyWith = {HasScopedValueCache.class, HasExtentLocalCache.class, LoomJDK.class}) //
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
     Object[] scopedValueCache;
 
@@ -657,7 +655,7 @@ static Object[] extentLocalCache() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = HasSetExtentLocalCache.class)
+    @TargetElement(onlyWith = HasExtentLocalCache.class)
     static void setExtentLocalCache(Object[] cache) {
         JavaThreads.toTarget(currentCarrierThread()).scopedValueCache = cache;
     }
@@ -669,7 +667,7 @@ static Object[] scopedValueCache() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = HasSetScopedValueCache.class)
+    @TargetElement(onlyWith = HasScopedValueCache.class)
     static void setScopedValueCache(Object[] cache) {
         JavaThreads.toTarget(currentCarrierThread()).scopedValueCache = cache;
     }