trivial inlining temp

Author: Maja Skoko

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java

@@ -36,6 +36,7 @@
 import java.util.Map.Entry;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ForkJoinPool;
 
@@ -198,6 +199,7 @@ protected PhaseSuite<HighTierContext> getAfterParseSuite() {
     private final boolean optionAOTTrivialInline = SubstrateOptions.AOTTrivialInline.getValue();
 
     private final ConcurrentMap<HostedMethod, CompilationGraph> unpublishedGraphs = new ConcurrentHashMap<>();
+    private final ConcurrentLinkedQueue<HostedMethod> unpublishedTrivialMethods = new ConcurrentLinkedQueue<>();
 
     public abstract static class CompileReason {
         /**
@@ -701,7 +703,6 @@ private void parseDeoptimizationTargetMethods() {
 
     private static boolean checkTrivial(HostedMethod method, StructuredGraph graph) {
         if (!method.compilationInfo.isTrivialMethod() && method.canBeInlined() && InliningUtilities.isTrivialMethod(graph)) {
-            method.compilationInfo.setTrivialMethod(true);
             return true;
         } else {
             return false;
@@ -731,7 +732,11 @@ protected void inlineTrivialMethods(DebugContext debug) throws InterruptedExcept
             for (Map.Entry<HostedMethod, CompilationGraph> entry : unpublishedGraphs.entrySet()) {
                 entry.getKey().compilationInfo.setCompilationGraph(entry.getValue());
             }
+            for (HostedMethod method : unpublishedTrivialMethods) {
+                method.compilationInfo.setTrivialMethod(true);
+            }
             unpublishedGraphs.clear();
+            unpublishedTrivialMethods.clear();
         } while (inliningProgress);
     }
 
@@ -838,6 +843,7 @@ private void doInlineTrivial(DebugContext debug, HostedMethod method) {
                      */
                     unpublishedGraphs.put(method, CompilationGraph.encode(graph));
                     if (checkTrivial(method, graph)) {
+                        unpublishedTrivialMethods.add(method);
                         inliningProgress = true;
                     }
                 }
@@ -1065,7 +1071,9 @@ private void defaultParseFunction(DebugContext debug, HostedMethod method, Compi
                 assert GraphOrder.assertSchedulableGraph(graph);
                 method.compilationInfo.encodeGraph(graph);
                 method.compilationInfo.setCompileOptions(getCustomizedOptions(method, debug));
-                checkTrivial(method, graph);
+                if (checkTrivial(method, graph)) {
+                    method.compilationInfo.setTrivialMethod(true);
+                }
 
             } catch (Throwable ex) {
                 GraalError error = ex instanceof GraalError ? (GraalError) ex : new GraalError(ex);