Generate BoundMethodHandle species unconditionally

Author: mur47x111

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/PreserveOptionsSupport.java

@@ -32,9 +32,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -143,7 +141,7 @@ public static void parsePreserveOption(EconomicMap<OptionKey<?>, Object> hostedV
     }
 
     public static void registerPreservedClasses(NativeImageClassLoaderSupport classLoaderSupport) {
-        var classesOrPackagesToIgnore = ignoredClassesOrPackagesForPreserve();
+        var classesOrPackagesToIgnore = SubstrateOptions.IgnorePreserveForClasses.getValue().valuesAsSet();
         var classesToPreserve = classLoaderSupport.getClassesToPreserve()
                         .filter(ClassInclusionPolicy::isClassIncludedBase)
                         .filter(c -> !(classesOrPackagesToIgnore.contains(c.getPackageName()) || classesOrPackagesToIgnore.contains(c.getName())))
@@ -224,11 +222,4 @@ public static void registerPreservedClasses(NativeImageClassLoaderSupport classL
             reflection.registerClassLookup(always, className);
         }
     }
-
-    private static Set<String> ignoredClassesOrPackagesForPreserve() {
-        Set<String> ignoredClassesOrPackages = new HashSet<>(SubstrateOptions.IgnorePreserveForClasses.getValue().valuesAsSet());
-        // GR-63360: Parsing of constant_ lambda forms fails
-        ignoredClassesOrPackages.add("java.lang.invoke.LambdaForm$Holder");
-        return Collections.unmodifiableSet(ignoredClassesOrPackages);
-    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, 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
@@ -26,6 +26,7 @@
 
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.VarHandle;
 import java.lang.ref.SoftReference;
@@ -288,6 +289,10 @@ 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.");
         }
+        // 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);
+        MethodHandles.constant(float.class, 0.0f);
     }
 
     private static void eagerlyInitializeMHImplFunctions() {