Initial push

mcimadamore · May 30, 2024 · b37f9cc · b37f9cc
1 parent 43a2f17
commit b37f9cc
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/java.base/share/classes/jdk/internal/foreign/Utils.java b/src/java.base/share/classes/jdk/internal/foreign/Utils.java
@@ -37,6 +37,8 @@
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
 import jdk.internal.access.SharedSecrets;
@@ -88,6 +90,14 @@ public static MemorySegment alignUp(MemorySegment ms, long alignment) {
     }
 
     public static VarHandle makeSegmentViewVarHandle(ValueLayout layout) {
+        final class VarHandleCache {
+            private static final Map<ValueLayout, VarHandle> HANDLE_MAP = new ConcurrentHashMap<>();
+        }
+        return VarHandleCache.HANDLE_MAP
+                .computeIfAbsent(layout.withoutName(), Utils::makeSegmentViewVarHandleInternal);
+    }
+
+    private static VarHandle makeSegmentViewVarHandleInternal(ValueLayout layout) {
         Class<?> baseCarrier = layout.carrier();
         if (layout.carrier() == MemorySegment.class) {
             baseCarrier = switch ((int) ValueLayout.ADDRESS.byteSize()) {
@@ -108,7 +118,7 @@ public static VarHandle makeSegmentViewVarHandle(ValueLayout layout) {
             handle = MethodHandles.filterValue(handle,
                     MethodHandles.explicitCastArguments(ADDRESS_TO_LONG, MethodType.methodType(baseCarrier, MemorySegment.class)),
                     MethodHandles.explicitCastArguments(MethodHandles.insertArguments(LONG_TO_ADDRESS, 1,
-                            pointeeByteSize(addressLayout), pointeeByteAlign(addressLayout)),
+                                    pointeeByteSize(addressLayout), pointeeByteAlign(addressLayout)),
                             MethodType.methodType(MemorySegment.class, baseCarrier)));
         }
         return handle;