[GR-68179] Introduce NeverInlineTrivial option

PullRequest: graal/21685

Author: jormundur00

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -902,6 +902,9 @@ public static long getTearDownFailureNanos() {
     @Option(help = "file:doc-files/NeverInlineHelp.txt", type = OptionType.Debug)//
     public static final HostedOptionKey<AccumulatingLocatableMultiOptionValue.Strings> NeverInline = new HostedOptionKey<>(AccumulatingLocatableMultiOptionValue.Strings.build());
 
+    @Option(help = "file:doc-files/NeverInlineHelp.txt")//
+    public static final HostedOptionKey<AccumulatingLocatableMultiOptionValue.Strings> NeverInlineTrivial = new HostedOptionKey<>(AccumulatingLocatableMultiOptionValue.Strings.build());
+
     @Option(help = "Maximum number of nodes in a method so that it is considered trivial.")//
     public static final HostedOptionKey<Integer> MaxNodesInTrivialMethod = new HostedOptionKey<>(20);
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/DynamicAccessDetectionFeature.java

@@ -99,7 +99,7 @@ public ConcurrentLinkedQueue<String> getMethodCallLocations(String methodName) {
         }
     }
 
-    private static final Set<String> neverInlineMethods = Set.of(
+    private static final Set<String> neverInlineTrivialMethods = Set.of(
                     "java.lang.invoke.MethodHandles$Lookup.unreflectGetter",
                     "java.lang.invoke.MethodHandles$Lookup.unreflectSetter",
                     "java.io.ObjectInputStream.readObject",
@@ -363,8 +363,8 @@ public static void parseDynamicAccessOptions(EconomicMap<OptionKey<?>, Object> h
             }
         });
         if (!classLoaderSupport.dynamicAccessSelectorsEmpty()) {
-            for (String method : neverInlineMethods) {
-                SubstrateOptions.NeverInline.update(hostedValues, method);
+            for (String method : neverInlineTrivialMethods) {
+                SubstrateOptions.NeverInlineTrivial.update(hostedValues, method);
             }
         }
     }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java

@@ -844,7 +844,9 @@ public boolean hasNeverInlineDirective(ResolvedJavaMethod method) {
             return false;
         }
 
-        return SubstrateOptions.NeverInline.getValue().values().stream().anyMatch(re -> MethodFilter.parse(re).matches(method));
+        return SubstrateOptions.NeverInline.getValue().values().stream()
+                        .map(MethodFilter::parse)
+                        .anyMatch(filter -> filter.matches(method));
     }
 
     private InlineBeforeAnalysisPolicy inlineBeforeAnalysisPolicy(MultiMethod.MultiMethodKey multiMethodKey) {
@@ -1216,7 +1218,10 @@ public boolean neverInlineTrivial(AnalysisMethod caller, AnalysisMethod callee)
                 return true;
             }
         }
-        return false;
+        if (!SubstrateOptions.NeverInlineTrivial.hasBeenSet()) {
+            return false;
+        }
+        return SubstrateOptions.NeverInlineTrivial.getValue().values().stream().anyMatch(re -> MethodFilter.parse(re).matches(callee));
     }
 
     private static boolean shouldEvaluateNeverInlineTrivialOnlyWith(Class<?>[] onlyWith) {