[GR-48173] Remove verifyObject call from AbstractForeignCallStub

PullRequest: graal/16026

Author: tkrodriguez

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/AbstractForeignCallStub.java

@@ -24,11 +24,11 @@
  */
 package jdk.graal.compiler.hotspot.stubs;
 
+import static jdk.graal.compiler.nodes.ConstantNode.forBoolean;
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCallee;
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall;
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
-import static jdk.graal.compiler.nodes.ConstantNode.forBoolean;
 
 import jdk.graal.compiler.core.common.CompilationIdentifier;
 import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
@@ -43,7 +43,6 @@
 import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor;
 import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider;
 import jdk.graal.compiler.hotspot.meta.HotSpotProviders;
-import jdk.graal.compiler.nodes.InvokeNode;
 import jdk.graal.compiler.nodes.ParameterNode;
 import jdk.graal.compiler.nodes.ReturnNode;
 import jdk.graal.compiler.nodes.StructuredGraph;
@@ -52,7 +51,6 @@
 import jdk.graal.compiler.replacements.GraphKit;
 import jdk.graal.compiler.replacements.nodes.ReadRegisterNode;
 import jdk.graal.compiler.word.WordTypes;
-
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotSignature;
 import jdk.vm.ci.meta.JavaMethod;
@@ -193,7 +191,7 @@ protected final Object debugScopeContext() {
      *             getAndClearObjectResult(thread());
      *             DeoptimizeCallerNode.deopt(None, RuntimeConstraint);
      *         }
-     *         return verifyObject(getAndClearObjectResult(thread()));
+     *         return getAndClearObjectResult(thread());
      *     }
      * </pre>
      *
@@ -236,7 +234,6 @@ protected final StructuredGraph getGraph(DebugContext debug, CompilationIdentifi
             ForeignCallSnippets.Templates foreignCallSnippets = lowerer.getForeignCallSnippets();
             ResolvedJavaMethod handlePendingException = foreignCallSnippets.handlePendingException.getMethod();
             ResolvedJavaMethod getAndClearObjectResult = foreignCallSnippets.getAndClearObjectResult.getMethod();
-            ResolvedJavaMethod verifyObject = foreignCallSnippets.verifyObject.getMethod();
             ResolvedJavaMethod thisMethod = getGraphMethod();
             HotSpotGraphKit kit = new HotSpotGraphKit(debug, thisMethod, providers, wordTypes, providers.getGraphBuilderPlugins(), compilationId, toString(), false, true);
             StructuredGraph graph = kit.getGraph();
@@ -247,8 +244,7 @@ protected final StructuredGraph getGraph(DebugContext debug, CompilationIdentifi
                 kit.createIntrinsicInvoke(handlePendingException, thread, forBoolean(shouldClearException, graph), forBoolean(isObjectResult, graph));
             }
             if (isObjectResult) {
-                InvokeNode object = kit.createIntrinsicInvoke(getAndClearObjectResult, thread);
-                result = kit.createIntrinsicInvoke(verifyObject, object);
+                result = kit.createIntrinsicInvoke(getAndClearObjectResult, thread);
             }
             kit.append(new ReturnNode(linkage.getDescriptor().getResultType() == void.class ? null : result));
             debug.dump(DebugContext.VERBOSE_LEVEL, graph, "Initial stub graph");

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ForeignCallSnippets.java

@@ -24,8 +24,12 @@
  */
 package jdk.graal.compiler.hotspot.stubs;
 
-import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint;
 import static jdk.graal.compiler.hotspot.stubs.StubUtil.fatal;
+import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint;
+
+import org.graalvm.word.LocationIdentity;
+import org.graalvm.word.Pointer;
+import org.graalvm.word.WordFactory;
 
 import jdk.graal.compiler.api.replacements.Fold;
 import jdk.graal.compiler.api.replacements.Fold.InjectedParameter;
@@ -44,10 +48,6 @@
 import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
 import jdk.graal.compiler.replacements.Snippets;
 import jdk.graal.compiler.word.Word;
-import org.graalvm.word.LocationIdentity;
-import org.graalvm.word.Pointer;
-import org.graalvm.word.WordFactory;
-
 import jdk.vm.ci.meta.DeoptimizationAction;
 
 public class ForeignCallSnippets implements Snippets {
@@ -56,15 +56,13 @@ public static class Templates extends AbstractTemplates {
 
         final SnippetInfo handlePendingException;
         final SnippetInfo getAndClearObjectResult;
-        final SnippetInfo verifyObject;
 
         @SuppressWarnings("this-escape")
         public Templates(OptionValues options, HotSpotProviders providers) {
             super(options, providers);
 
             this.handlePendingException = snippet(providers, ForeignCallSnippets.class, "handlePendingException");
             this.getAndClearObjectResult = snippet(providers, ForeignCallSnippets.class, "getAndClearObjectResult", OBJECT_RESULT_LOCATION);
-            this.verifyObject = snippet(providers, ForeignCallSnippets.class, "verifyObject");
         }
     }