Refactor PerfCounter substitutions and ensure LambdaForm.LF_FAILED is initialized and folded.

Author: cstancu

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/Target_jdk_internal_perf_PerfCounter.java

@@ -29,17 +29,30 @@
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.core.util.VMError;
 
 /**
- * PerfCounter objects that end up in the image heap reference an invalid buffer (see
- * PerfCounter.lb). Accessing this buffer would result in a segfault, so we substitute all methods
- * that may access this buffer.
+ * {@code PerfCounter} objects created at build time and written in the image heap reference an
+ * invalid buffer via the {@code PerfCounter.lb} field. Accessing this buffer would result in a
+ * segfault, so we substitute all methods that may access this buffer. Moreover, we delete the
+ * buffer field since it should never be reachable and make the factory methods that would
+ * initialize it throw an {@link VMError#unsupportedFeature(String)} at run time.
  */
 @TargetClass(className = "jdk.internal.perf.PerfCounter")
 final class Target_jdk_internal_perf_PerfCounter {
     @Delete //
     private LongBuffer lb;
 
+    @Substitute  //
+    public static Target_jdk_internal_perf_PerfCounter newPerfCounter(@SuppressWarnings("unused") String name) {
+        throw VMError.unsupportedFeature("Creating a new jdk.internal.perf.PerfCounter at run time is currently not supported.");
+    }
+
+    @Substitute  //
+    public static Target_jdk_internal_perf_PerfCounter newConstantPerfCounter(@SuppressWarnings("unused") String name) {
+        throw VMError.unsupportedFeature("Creating a new jdk.internal.perf.PerfCounter at run time is currently not supported.");
+    }
+
     @Substitute
     @SuppressWarnings("static-method")
     public long get() {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java

@@ -301,6 +301,17 @@ public Object transform(Object receiver, Object originalValue) {
         } catch (ReflectiveOperationException e) {
             VMError.shouldNotReachHere("Can not invoke createFormsForm method to register base types from the java.lang.invoke.LambdaForm$BasicType class.");
         }
+
+        /*
+         * Allocating PerfCounter objects at run-time is not supported. For more details see the
+         * Target_jdk_internal_perf_PerfCounter substitutions. Here we ensure that the @Stable field
+         * java.lang.invoke.LambdaForm.LF_FAILED is initialized and is allowed to be folded before
+         * analysis to eliminate any code paths that would try initializing it.
+         */
+        Method failedCompilationCounterMethod = ReflectionUtil.lookupMethod(lambdaFormClass, "failedCompilationCounter");
+        ReflectionUtil.invokeMethod(failedCompilationCounterMethod, null);
+        access.allowStableFieldFoldingBeforeAnalysis(access.findField(lambdaFormClass, "LF_FAILED"));
+
         // The following call sites produce side effects by generating BoundMethodHandle
         // species, which are subsequently referenced by java.lang.invoke.LambdaForm$Holder.
         MethodHandles.constant(long.class, 0L);

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/CremaFeature.java

@@ -28,7 +28,6 @@
 import static com.oracle.graal.pointsto.ObjectScanner.ScanReason;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
@@ -94,7 +93,6 @@ private static boolean assertionsEnabled() {
 
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
-        methodHandleSetup();
         FeatureImpl.BeforeAnalysisAccessImpl accessImpl = (FeatureImpl.BeforeAnalysisAccessImpl) access;
         try {
             AnalysisType declaringClass = accessImpl.getMetaAccess().lookupJavaType(InterpreterStubSection.class);
@@ -106,16 +104,6 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
         }
     }
 
-    private static void methodHandleSetup() {
-        /*
-         * Get java.lang.invoke.LambdaForm.LF_FAILED initialized since we don't support perf counter
-         * creation at run-time. See Target_jdk_internal_perf_PerfCounter.
-         */
-        Class<?> lfClass = ReflectionUtil.lookupClass("java.lang.invoke.LambdaForm");
-        Method failedCompilationCounterMethod = ReflectionUtil.lookupMethod(lfClass, "failedCompilationCounter");
-        ReflectionUtil.invokeMethod(failedCompilationCounterMethod, null);
-    }
-
     @Override
     public void afterAnalysis(AfterAnalysisAccess access) {
         AnalysisUniverse aUniverse = ((FeatureImpl.AfterAnalysisAccessImpl) access).getUniverse();