make sure the AnalysisFields in FieldLocationIdentity are properly transplanted to HostedFields

Author: d-kozak

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/tesa/AbstractTesa.java

@@ -40,6 +40,7 @@
 import com.oracle.svm.common.meta.MultiMethod;
 import com.oracle.svm.hosted.analysis.tesa.effect.TesaEffect;
 import com.oracle.svm.hosted.meta.HostedMethod;
+import com.oracle.svm.hosted.meta.HostedUniverse;
 import com.oracle.svm.util.ClassUtil;
 
 import jdk.graal.compiler.graph.Node;
@@ -229,7 +230,7 @@ public T getState(TesaEngine engine, Invoke invoke) {
     /**
      * Apply the results of this analysis on the given compilation {@code graph}.
      */
-    public void applyResults(TesaEngine engine, HostedMethod method, StructuredGraph graph) {
+    public void applyResults(TesaEngine engine, HostedUniverse universe, HostedMethod method, StructuredGraph graph) {
         var state = getState(method.wrapped);
         if (hasOptimizationPotential(state)) {
             onOptimizableMethodDiscovered(method, state, graph);
@@ -240,7 +241,7 @@ public void applyResults(TesaEngine engine, HostedMethod method, StructuredGraph
                 var targetState = getState(engine, invoke);
                 if (hasOptimizationPotential(targetState)) {
                     optimizableInvokesCounter.incrementAndGet();
-                    optimizeInvoke(graph, invoke, targetState);
+                    optimizeInvoke(universe, graph, invoke, targetState);
                 }
             }
         }
@@ -279,7 +280,7 @@ protected boolean hasOptimizationPotential(T state) {
      * have to implement it.
      */
     @SuppressWarnings("unused")
-    protected void optimizeInvoke(StructuredGraph graph, Invoke invoke, T targetState) {
+    protected void optimizeInvoke(HostedUniverse universe, StructuredGraph graph, Invoke invoke, T targetState) {
 
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/tesa/KilledLocationTesa.java

@@ -26,12 +26,17 @@
 
 import org.graalvm.word.LocationIdentity;
 
+import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.util.AnalysisError;
+import com.oracle.svm.core.graal.nodes.SubstrateFieldLocationIdentity;
 import com.oracle.svm.hosted.analysis.tesa.effect.LocationEffect;
+import com.oracle.svm.hosted.code.AnalysisToHostedGraphTransplanter;
 import com.oracle.svm.hosted.meta.HostedMethod;
+import com.oracle.svm.hosted.meta.HostedUniverse;
 
 import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
 import jdk.graal.compiler.nodes.Invoke;
 import jdk.graal.compiler.nodes.InvokeNode;
 import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
@@ -114,14 +119,36 @@ private static boolean checkNoSafepointNodes(HostedMethod method, LocationEffect
     }
 
     @Override
-    protected void optimizeInvoke(StructuredGraph graph, Invoke invoke, LocationEffect targetState) {
+    protected void optimizeInvoke(HostedUniverse universe, StructuredGraph graph, Invoke invoke, LocationEffect targetState) {
         switch (targetState) {
             case LocationEffect.Empty _ -> setKilledLocationIdentity(invoke, MemoryKill.NO_LOCATION);
-            case LocationEffect.Single single -> setKilledLocationIdentity(invoke, single.location);
+            case LocationEffect.Single single -> setKilledLocationIdentity(invoke, transplantIdentity(universe, single.location));
             default -> AnalysisError.shouldNotReachHere(targetState + " is not actionable.");
         }
     }
 
+    /**
+     * The effects computed by the analysis may still contain <i>analysis</i> references that have
+     * to be transplanted to <i>hosted</i>.
+     * 
+     * @see AnalysisToHostedGraphTransplanter
+     */
+    private static LocationIdentity transplantIdentity(HostedUniverse universe, LocationIdentity location) {
+        return switch (location) {
+            case SubstrateFieldLocationIdentity substrateFieldLocationIdentity -> {
+                var field = substrateFieldLocationIdentity.getField();
+                assert field instanceof AnalysisField : "The field computed by the TESA should be still an analysis field: " + field;
+                yield new SubstrateFieldLocationIdentity(universe.lookup(field), substrateFieldLocationIdentity.isImmutable());
+            }
+            case FieldLocationIdentity fieldLocationIdentity -> {
+                var field = fieldLocationIdentity.getField();
+                assert field instanceof AnalysisField : "The field computed by the TESA should be still an analysis field: " + field;
+                yield new FieldLocationIdentity(universe.lookup(field), fieldLocationIdentity.isImmutable());
+            }
+            default -> location;
+        };
+    }
+
     private static void setKilledLocationIdentity(Invoke invoke, LocationIdentity locationIdentity) {
         switch (invoke) {
             case InvokeNode invokeNode -> invokeNode.setKilledLocationIdentity(locationIdentity);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/tesa/TesaEngine.java

@@ -46,6 +46,7 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.analysis.tesa.effect.TesaEffect;
 import com.oracle.svm.hosted.meta.HostedMethod;
+import com.oracle.svm.hosted.meta.HostedUniverse;
 import com.oracle.svm.util.ClassUtil;
 import com.oracle.svm.util.ImageBuildStatistics;
 
@@ -181,15 +182,15 @@ public void runFixedPointLoops(BigBang bb) {
     /**
      * @see AbstractTesa#applyResults
      */
-    public void applyResults(HostedMethod method, StructuredGraph graph) {
+    public void applyResults(HostedUniverse universe, HostedMethod method, StructuredGraph graph) {
         totalMethodsCounter.incrementAndGet();
         for (Node node : graph.getNodes()) {
             if (node instanceof Invoke) {
                 totalInvokesCounter.incrementAndGet();
             }
         }
         for (AbstractTesa<?> analysis : analyses.values()) {
-            analysis.applyResults(this, method, graph);
+            analysis.applyResults(this, universe, method, graph);
         }
     }
 

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

@@ -1398,7 +1398,7 @@ private CompilationResult defaultCompileFunction(DebugContext debug, HostedMetho
             assert GraphOrder.assertSchedulableGraph(graph);
 
             if (TesaEngine.enabled()) {
-                TesaEngine.get().applyResults(method, graph);
+                TesaEngine.get().applyResults(universe, method, graph);
             }
 
             try (DebugContext.Scope _ = debug.scope("Compiling", graph, method, this);