src/java.base/share/classes/java/lang/invoke/IndirectVarHandle.java

@@ -57,7 +57,7 @@ private IndirectVarHandle(VarHandle target, Class<?> value, Class<?>[] coordinat
         super(form, exact);
         this.handleFactory = handleFactory;
         this.target = target;
-        this.directTarget = target.asDirect();
+        this.directTarget = target.target();
         this.value = value;
         this.coordinates = coordinates;
     }
@@ -68,8 +68,9 @@ MethodType accessModeTypeUncached(AccessType at) {
     }
 
     @Override
-    VarHandle asDirect() {
-        return directTarget;
+    @ForceInline
+    VarHandle target() {
+        return this.directTarget;
     }
 
     @Override
@@ -82,10 +83,11 @@ public VarHandle withInvokeExactBehavior() {
     @Override
     public VarHandle withInvokeBehavior() {
         return !hasInvokeExactBehavior()
-                ? this
-                : new IndirectVarHandle(target, value, coordinates, handleFactory, vform, false);
+            ? this
+            : new IndirectVarHandle(target, value, coordinates, handleFactory, vform, false);
     }
 
+    @Override
     @ForceInline
     boolean checkAccessModeThenIsDirect(VarHandle.AccessDescriptor ad) {
         super.checkAccessModeThenIsDirect(ad);
@@ -103,9 +105,4 @@ MethodHandle getMethodHandleUncached(int mode) {
         MethodHandle targetHandle = target.getMethodHandle(mode); // might throw UOE of access mode is not supported, which is ok
         return handleFactory.apply(AccessMode.values()[mode], targetHandle);
     }
-
-    @Override
-    public MethodHandle toMethodHandle(AccessMode accessMode) {
-        return getMethodHandle(accessMode.ordinal()).bindTo(directTarget);
-    }
 }

src/java.base/share/classes/java/lang/invoke/Invokers.java

@@ -561,7 +561,7 @@ static MethodHandle checkGenericType(MethodHandle mh,  MethodType expected) {
     @ForceInline
     /*non-public*/
     static VarHandle directVarHandleTarget(VarHandle handle) {
-        return handle.asDirect();
+        return handle.target();
     }
 
     static MemberName linkToCallSiteMethod(MethodType mtype) {

src/java.base/share/classes/java/lang/invoke/LazyInitializingVarHandle.java

@@ -0,0 +1,141 @@
+/*
+ *  Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ *  This code is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 only, as
+ *  published by the Free Software Foundation.  Oracle designates this
+ *  particular file as subject to the "Classpath" exception as provided
+ *  by Oracle in the LICENSE file that accompanied this code.
+ *
+ *  This code is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  version 2 for more details (a copy is included in the LICENSE file that
+ *  accompanied this code).
+ *
+ *  You should have received a copy of the GNU General Public License version
+ *  2 along with this work; if not, write to the Free Software Foundation,
+ *  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ *  or visit www.oracle.com if you need additional information or have any
+ *  questions.
+ *
+ */
+
+package java.lang.invoke;
+
+import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
+
+import java.util.Optional;
+
+import static java.lang.invoke.MethodHandleStatics.UNSAFE;
+import static java.lang.invoke.MethodHandleStatics.uncaughtException;
+import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
+
+/**
+ * A lazy initializing var handle. It lazily initializes the referenced class before
+ * any invocation of the target var handle to prevent reading uninitialized static
+ * final field values.
+ */
+final class LazyInitializingVarHandle extends VarHandle {
+
+    private final VarHandle target;
+    private final Class<?> refc;
+    private @Stable boolean initialized;
+
+    LazyInitializingVarHandle(VarHandle target, Class<?> refc) {
+        super(target.vform, target.exact);
+        this.target = target;
+        this.refc = refc;
+    }
+
+    @Override
+    boolean checkAccessModeThenIsDirect(AccessDescriptor ad) {
+        super.checkAccessModeThenIsDirect(ad);
+        return false;
+    }
+
+    @Override
+    MethodType accessModeTypeUncached(AccessType at) {
+        return target.accessModeType(at.ordinal());
+    }
+
+    @Override
+    @ForceInline
+    VarHandle target() {
+        return target;
+    }
+
+    @Override
+    public VarHandle withInvokeExactBehavior() {
+        if (!initialized && hasInvokeExactBehavior())
+            return this;
+        var exactTarget = target.withInvokeExactBehavior();
+        return initialized ? exactTarget : new LazyInitializingVarHandle(exactTarget, refc);
+    }
+
+    @Override
+    public VarHandle withInvokeBehavior() {
+        if (!initialized && !hasInvokeExactBehavior())
+            return this;
+        var nonExactTarget = target.withInvokeBehavior();
+        return initialized ? nonExactTarget : new LazyInitializingVarHandle(nonExactTarget, refc);
+    }
+
+    @Override
+    public Optional<VarHandleDesc> describeConstable() {
+        return target.describeConstable();
+    }
+
+    @Override
+    public MethodHandle getMethodHandleUncached(int accessMode) {
+        ensureInitialized();
+        return target.getMethodHandle(accessMode);
+    }
+
+    @ForceInline
+    private void ensureInitialized() {
+        if (this.initialized)
+            return;
+
+        initialize();
+    }
+
+    private void initialize() {
+        UNSAFE.ensureClassInitialized(refc);
+        this.initialized = true;
+
+        this.methodHandleTable = target.methodHandleTable;
+    }
+
+    private static @Stable MethodHandle MH_ensureInitialized;
+
+    private static MethodHandle ensureInitializedMh() {
+        var mh = MH_ensureInitialized;
+        if (mh != null)
+            return mh;
+
+        try {
+            return MH_ensureInitialized = IMPL_LOOKUP.findVirtual(LazyInitializingVarHandle.class,
+                    "ensureInitialized",
+                    MethodType.methodType(void.class));
+        } catch (Throwable ex) {
+            throw uncaughtException(ex);
+        }
+    }
+
+    // regular impl uses getMethodHandle which we avoid, for our getMethodHandle
+    // serves as an initialization barrier
+    @Override
+    public MethodHandle toMethodHandle(AccessMode accessMode) {
+        var mh = target.toMethodHandle(accessMode);
+        if (initialized)
+            return mh;
+
+        // Add barrier
+        return MethodHandles.collectArguments(mh, 0, ensureInitializedMh()).bindTo(this);
+    }
+}

src/java.base/share/classes/java/lang/invoke/MethodHandles.java

@@ -4201,7 +4201,7 @@ private VarHandle getFieldVarHandleCommon(byte getRefKind, byte putRefKind,
                 }
                 refc = lookupClass();
             }
-            return VarHandles.makeFieldHandle(getField, refc, getField.getFieldType(),
+            return VarHandles.makeFieldHandle(getField, refc,
                                               this.allowedModes == TRUSTED && !getField.isTrustedFinalField());
         }
         /** Check access and get the requested constructor. */

src/java.base/share/classes/java/lang/invoke/VarHandle.java

@@ -472,7 +472,8 @@
  * @since 9
  */
 public abstract sealed class VarHandle implements Constable
-     permits IndirectVarHandle, VarHandleSegmentViewBase,
+     permits IndirectVarHandle, LazyInitializingVarHandle,
+             VarHandleSegmentViewBase,
              VarHandleByteArrayAsChars.ByteArrayViewVarHandle,
              VarHandleByteArrayAsDoubles.ByteArrayViewVarHandle,
              VarHandleByteArrayAsFloats.ByteArrayViewVarHandle,
@@ -518,11 +519,17 @@ public abstract sealed class VarHandle implements Constable
         this.exact = exact;
     }
 
-    RuntimeException unsupported() {
-        return new UnsupportedOperationException();
-    }
-
-    VarHandle asDirect() {
+    /**
+     * The VarHandle to be passed to {@link #getMethodHandle}, in Invokers
+     * LambdaForms and VarHandleGuards.
+     * Direct VH implementation methods also call this method to
+     * unwrap lazy initializing VarHandles.
+     *
+     * @see #getMethodHandle(int)
+     * @see #checkAccessModeThenIsDirect(AccessDescriptor)
+     */
+    @ForceInline
+    VarHandle target() {
         return this;
     }
 
@@ -2062,13 +2069,19 @@ public final MethodType accessModeType(AccessMode accessMode) {
 
     /**
      * Validates that the given access descriptors method type matches up with
-     * the access mode of this VarHandle, then returns if this is a direct
-     * method handle. These operations were grouped together to slightly
+     * the access mode of this VarHandle, then returns if this is direct.
+     * These operations were grouped together to slightly
      * improve efficiency during startup/warmup.
      *
+     * A direct VarHandle's VarForm has implementation MemberNames that can
+     * be linked directly. If a VarHandle is indirect, it must override
+     * {@link #isAccessModeSupported} and {@link #getMethodHandleUncached}
+     * which access MemberNames..
+     *
      * @return true if this is a direct VarHandle, false if it's an indirect
      *         VarHandle.
      * @throws WrongMethodTypeException if there's an access type mismatch
+     * @see #target()
      */
     @ForceInline
     boolean checkAccessModeThenIsDirect(VarHandle.AccessDescriptor ad) {
@@ -2144,7 +2157,7 @@ public boolean isAccessModeSupported(AccessMode accessMode) {
     public MethodHandle toMethodHandle(AccessMode accessMode) {
         if (isAccessModeSupported(accessMode)) {
             MethodHandle mh = getMethodHandle(accessMode.ordinal());
-            return mh.bindTo(this);
+            return mh.bindTo(target());
         }
         else {
             // Ensure an UnsupportedOperationException is thrown
@@ -2186,6 +2199,14 @@ final MethodHandle getMethodHandle(int mode) {
         return mh;
     }
 
+    /**
+     * Computes a method handle that can be passed the {@linkplain #target() direct}
+     * var handle of this var handle with the given access mode. Pre/postprocessing
+     * such as argument or return value filtering should be done by the returned
+     * method handle.
+     *
+     * @throws UnsupportedOperationException if the access mode is not supported
+     */
     MethodHandle getMethodHandleUncached(int mode) {
         MethodType mt = accessModeType(AccessMode.values()[mode]).
                 insertParameterTypes(0, VarHandle.class);
@@ -2401,13 +2422,13 @@ public ClassDesc varType() {
         public VarHandle resolveConstantDesc(MethodHandles.Lookup lookup)
                 throws ReflectiveOperationException {
             return switch (kind) {
-                case FIELD        -> lookup.findVarHandle((Class<?>) declaringClass.resolveConstantDesc(lookup),
+                case FIELD        -> lookup.findVarHandle(declaringClass.resolveConstantDesc(lookup),
                                                           constantName(),
-                                                          (Class<?>) varType.resolveConstantDesc(lookup));
-                case STATIC_FIELD -> lookup.findStaticVarHandle((Class<?>) declaringClass.resolveConstantDesc(lookup),
+                                                          varType.resolveConstantDesc(lookup));
+                case STATIC_FIELD -> lookup.findStaticVarHandle(declaringClass.resolveConstantDesc(lookup),
                                                           constantName(),
-                                                          (Class<?>) varType.resolveConstantDesc(lookup));
-                case ARRAY        -> MethodHandles.arrayElementVarHandle((Class<?>) declaringClass.resolveConstantDesc(lookup));
+                                                          varType.resolveConstantDesc(lookup));
+                case ARRAY        -> MethodHandles.arrayElementVarHandle(declaringClass.resolveConstantDesc(lookup));
                 default -> throw new InternalError("Cannot reach here");
             };
         }