Lower LoadMethodByIndexNode in Web Image

The default lowering in NonSnippetLowerings is used

Author: patrick96

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageFeature.java

@@ -33,6 +33,8 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.graalvm.nativeimage.AnnotationAccess;
@@ -61,7 +63,10 @@
 import com.oracle.svm.core.code.ImageCodeInfo;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider;
+import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
+import com.oracle.svm.core.heap.RestrictHeapAccessCallees;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.hub.DynamicHubCompanion;
 import com.oracle.svm.core.jdk.FileSystemProviderSupport;
@@ -83,6 +88,7 @@
 import com.oracle.svm.hosted.webimage.codegen.WebImageProviders;
 import com.oracle.svm.hosted.webimage.name.WebImageNamingConvention;
 import com.oracle.svm.hosted.webimage.options.WebImageOptions;
+import com.oracle.svm.hosted.webimage.snippets.WebImageNonSnippetLowerings;
 import com.oracle.svm.hosted.webimage.wasm.WasmLogHandler;
 import com.oracle.svm.util.ReflectionUtil;
 import com.oracle.svm.webimage.WebImageJSLog;
@@ -103,8 +109,11 @@
 import com.oracle.svm.webimage.substitute.system.WebImageTempFileHelperSupportWithoutSecureRandom;
 
 import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 @AutomaticallyRegisteredFeature
 @Platforms(WebImagePlatform.class)
@@ -123,6 +132,16 @@ public void registerForeignCalls(SubstrateForeignCallsProvider foreignCalls) {
         ImplicitExceptions.registerForeignCalls(foreignCalls);
     }
 
+    @Override
+    public void registerLowerings(RuntimeConfiguration runtimeConfig, OptionValues options, Providers providers, Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings, boolean hosted) {
+        Predicate<ResolvedJavaMethod> mustNotAllocatePredicate = null;
+        if (hosted) {
+            mustNotAllocatePredicate = method -> ImageSingletons.lookup(RestrictHeapAccessCallees.class).mustNotAllocate(method);
+        }
+
+        WebImageNonSnippetLowerings.registerLowerings(runtimeConfig, mustNotAllocatePredicate, options, providers, lowerings, hosted);
+    }
+
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
         FeatureImpl.BeforeAnalysisAccessImpl accessImpl = (FeatureImpl.BeforeAnalysisAccessImpl) access;

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/js/WebImageJSLoweringProvider.java

@@ -26,6 +26,7 @@
 package com.oracle.svm.hosted.webimage.js;
 
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
+import com.oracle.svm.core.graal.nodes.LoadMethodByIndexNode;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
 import com.oracle.svm.hosted.webimage.WebImageLoweringProvider;
 import com.oracle.svm.hosted.webimage.snippets.WebImageIdentityHashCodeSnippets;
@@ -61,7 +62,7 @@ protected IdentityHashCodeSnippets.Templates createIdentityHashCodeSnippets(Opti
     @SuppressWarnings("unchecked")
     @Override
     public void lower(Node n, LoweringTool tool) {
-        if (n instanceof EnsureClassInitializedNode || n instanceof ValidateNewInstanceClassNode) {
+        if (n instanceof EnsureClassInitializedNode || n instanceof ValidateNewInstanceClassNode || n instanceof LoadMethodByIndexNode) {
             @SuppressWarnings("rawtypes")
             NodeLoweringProvider nodeLoweringProvider = getLowerings().get(n.getClass());
 

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasm/snippets/WebImageWasmNonSnippetLowerings.java renamed to web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/snippets/WebImageNonSnippetLowerings.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.oracle.svm.hosted.webimage.wasm.snippets;
+package com.oracle.svm.hosted.webimage.snippets;
 
 import java.util.Map;
 import java.util.function.Predicate;
@@ -37,16 +37,16 @@
 import jdk.graal.compiler.phases.util.Providers;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-public class WebImageWasmNonSnippetLowerings extends NonSnippetLowerings {
+public class WebImageNonSnippetLowerings extends NonSnippetLowerings {
 
     @SuppressWarnings("unused")
     public static void registerLowerings(RuntimeConfiguration runtimeConfig, Predicate<ResolvedJavaMethod> mustNotAllocatePredicate, OptionValues options,
                     Providers providers, Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings, boolean hosted) {
 
-        new WebImageWasmNonSnippetLowerings(runtimeConfig, mustNotAllocatePredicate, options, providers, lowerings, hosted);
+        new WebImageNonSnippetLowerings(runtimeConfig, mustNotAllocatePredicate, options, providers, lowerings, hosted);
     }
 
-    protected WebImageWasmNonSnippetLowerings(RuntimeConfiguration runtimeConfig, Predicate<ResolvedJavaMethod> mustNotAllocatePredicate, OptionValues options, Providers providers,
+    protected WebImageNonSnippetLowerings(RuntimeConfiguration runtimeConfig, Predicate<ResolvedJavaMethod> mustNotAllocatePredicate, OptionValues options, Providers providers,
                     Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings, boolean hosted) {
         super(runtimeConfig, mustNotAllocatePredicate, options, providers, lowerings, hosted);
     }

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasm/codegen/WebImageWasmLMNodeLowerer.java

@@ -41,6 +41,7 @@
 import static com.oracle.svm.webimage.functionintrinsics.JSCallNode.MEM_FREE;
 import static com.oracle.svm.webimage.functionintrinsics.JSCallNode.MEM_MALLOC;
 import static com.oracle.svm.webimage.functionintrinsics.JSCallNode.MEM_REALLOC;
+import static com.oracle.svm.webimage.wasm.types.WasmPrimitiveType.i64;
 
 import java.util.Set;
 
@@ -394,10 +395,17 @@ protected <T extends FixedNode & Invoke> Instruction lowerInvoke(T node) {
         callTarget.arguments().forEach(param -> params.add(lowerExpression(param)));
 
         if (callTarget instanceof IndirectCallTargetNode indirectCallTarget) {
+            WasmPrimitiveType addressType = util.typeForNode(indirectCallTarget.computedAddress()).asPrimitive();
+            Instruction index = lowerExpression(indirectCallTarget.computedAddress());
             /*
-             * TODO GR-42105 stop using wrap
+             * The computed address can have different kind of stamps that are represented as either
+             * i32 or i64 in wasm. For example the stamp could be an i64 integer stamp (represented
+             * as i64) or a method pointer stamp (represented as i32). If the computed address is
+             * represented as an i64, it has to first be truncated to i32.
              */
-            Instruction index = Unary.Op.I32Wrap64.create(lowerExpression(indirectCallTarget.computedAddress()));
+            if (addressType == i64) {
+                index = Unary.Op.I32Wrap64.create(index);
+            }
             TypeUse typeUse;
 
             if (targetMethod == null) {

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasm/snippets/WasmLMSnippetsFeature.java

@@ -26,35 +26,24 @@
 package com.oracle.svm.hosted.webimage.wasm.snippets;
 
 import java.util.Map;
-import java.util.function.Predicate;
 
-import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
-import com.oracle.svm.core.heap.RestrictHeapAccessCallees;
 import com.oracle.svm.webimage.platform.WebImageWasmLMPlatform;
 
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.phases.util.Providers;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 @AutomaticallyRegisteredFeature
 @Platforms(WebImageWasmLMPlatform.class)
 class WasmLMSnippetsFeature implements InternalFeature {
-
     @Override
     public void registerLowerings(RuntimeConfiguration runtimeConfig, OptionValues options, Providers providers, Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings, boolean hosted) {
-        Predicate<ResolvedJavaMethod> mustNotAllocatePredicate = null;
-        if (hosted) {
-            mustNotAllocatePredicate = method -> ImageSingletons.lookup(RestrictHeapAccessCallees.class).mustNotAllocate(method);
-        }
-
         WebImageWasmArithmeticSnippets.registerLowerings(options, providers, lowerings);
-        WebImageWasmNonSnippetLowerings.registerLowerings(runtimeConfig, mustNotAllocatePredicate, options, providers, lowerings, hosted);
     }
 }

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasmgc/WebImageWasmGCLoweringProvider.java

@@ -32,6 +32,7 @@
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.graal.jdk.SubstrateObjectCloneNode;
 import com.oracle.svm.core.graal.jdk.SubstrateObjectCloneWithExceptionNode;
+import com.oracle.svm.core.graal.nodes.LoadMethodByIndexNode;
 import com.oracle.svm.core.graal.nodes.ThrowBytecodeExceptionNode;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
 import com.oracle.svm.core.hub.DynamicHub;
@@ -112,7 +113,8 @@ public WebImageWasmGCLoweringProvider(MetaAccessProvider metaAccess, ForeignCall
                     SubstrateObjectCloneNode.class,
                     SubstrateObjectCloneWithExceptionNode.class,
                     IntegerDivRemNode.class,
-                    DeoptimizeNode.class));
+                    DeoptimizeNode.class,
+                    LoadMethodByIndexNode.class));
 
     @Override
     public void initialize(OptionValues options, SnippetCounter.Group.Factory factory, Providers providers) {

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasmgc/snippets/WasmGCSnippetsFeature.java

@@ -26,36 +26,25 @@
 package com.oracle.svm.hosted.webimage.wasmgc.snippets;
 
 import java.util.Map;
-import java.util.function.Predicate;
 
-import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
-import com.oracle.svm.core.heap.RestrictHeapAccessCallees;
 import com.oracle.svm.hosted.webimage.wasm.snippets.WebImageWasmArithmeticSnippets;
-import com.oracle.svm.hosted.webimage.wasm.snippets.WebImageWasmNonSnippetLowerings;
 import com.oracle.svm.webimage.platform.WebImageWasmGCPlatform;
 
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.phases.util.Providers;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 @AutomaticallyRegisteredFeature
 @Platforms(WebImageWasmGCPlatform.class)
 public class WasmGCSnippetsFeature implements InternalFeature {
     @Override
     public void registerLowerings(RuntimeConfiguration runtimeConfig, OptionValues options, Providers providers, Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings, boolean hosted) {
-        Predicate<ResolvedJavaMethod> mustNotAllocatePredicate = null;
-        if (hosted) {
-            mustNotAllocatePredicate = method -> ImageSingletons.lookup(RestrictHeapAccessCallees.class).mustNotAllocate(method);
-        }
-
         WebImageWasmArithmeticSnippets.registerLowerings(options, providers, lowerings);
-        WebImageWasmNonSnippetLowerings.registerLowerings(runtimeConfig, mustNotAllocatePredicate, options, providers, lowerings, hosted);
     }
 }