simplify safepoint handling, WIP

Author: d-kozak

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

@@ -233,7 +233,6 @@ public T getState(TesaEngine engine, Invoke invoke) {
     public void applyResults(TesaEngine engine, HostedUniverse universe, HostedMethod method, StructuredGraph graph) {
         var state = getState(method.wrapped);
         if (hasOptimizationPotential(state)) {
-            onOptimizableMethodDiscovered(method, state, graph);
             optimizableMethodsCounter.incrementAndGet();
         }
         for (Node node : graph.getNodes()) {
@@ -247,15 +246,6 @@ public void applyResults(TesaEngine engine, HostedUniverse universe, HostedMetho
         }
     }
 
-    /**
-     * Hook for subclasses to perform any postprocessing or correctness checks for methods found as
-     * optimizable.
-     */
-    @SuppressWarnings("unused")
-    protected void onOptimizableMethodDiscovered(HostedMethod method, T state, StructuredGraph graph) {
-
-    }
-
     /**
      * Hook for subclasses to check if the given {@code invoke} can be optimized by the given
      * analysis. By default, try to optimize all invokes.

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

@@ -32,7 +32,6 @@
 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;
@@ -65,6 +64,7 @@ protected LocationEffect anyEffect() {
     protected LocationEffect computeInitialState(AnalysisMethod method, StructuredGraph graph) {
         LocationEffect location = noEffect();
         for (Node node : graph.getNodes()) {
+            assert !(node instanceof SafepointNode) : KilledLocationTesa.class.getSimpleName() + " does not support safepoints.";
             if (!isSupportedNode(node)) {
                 return anyEffect();
             }
@@ -101,23 +101,6 @@ public static LocationIdentity[] extractLocationIdentities(Node node) {
         };
     }
 
-    @Override
-    protected void onOptimizableMethodDiscovered(HostedMethod method, LocationEffect state, StructuredGraph graph) {
-        assert checkNoSafepointNodes(method, state, graph);
-    }
-
-    /**
-     * Methods containing {@link SafepointNode} can kill multiple locations, which we do not track
-     * precisely at the moment. To guarantee correctness, we verify that only methods without
-     * safepoints have more precise killed location than {@code any}.
-     */
-    private static boolean checkNoSafepointNodes(HostedMethod method, LocationEffect state, StructuredGraph graph) {
-        for (Node node : graph.getNodes()) {
-            AnalysisError.guarantee(!(node instanceof SafepointNode), "Method %s has a safepoint node in its graph, but its killed location is not any: %s", method.getQualifiedName(), state);
-        }
-        return true;
-    }
-
     @Override
     protected void optimizeInvoke(HostedUniverse universe, StructuredGraph graph, Invoke invoke, LocationEffect targetState) {
         switch (targetState) {