[GR-59963] Fix stamps in ReadExceptionObjectNode

PullRequest: graal/19391
oracle · Dec 5, 2024 · 15759c9 · 15759c9
2 parents 8459a70 + 877d818
commit 15759c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/...aal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java b/...aal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java
@@ -24,19 +24,19 @@
  */
 package com.oracle.svm.core.graal.llvm.lowering;
 
-import jdk.graal.compiler.core.common.type.StampFactory;
+import com.oracle.svm.core.graal.nodes.ReadExceptionObjectNode;
+import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
+import com.oracle.svm.core.nodes.CFunctionEpilogueNode;
+import com.oracle.svm.core.thread.VMThreads;
+
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.nodes.FixedWithNextNode;
 import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.java.LoadExceptionObjectNode;
 import jdk.graal.compiler.nodes.spi.LoweringTool;
 
-import com.oracle.svm.core.graal.nodes.ReadExceptionObjectNode;
-import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
-import com.oracle.svm.core.nodes.CFunctionEpilogueNode;
-import com.oracle.svm.core.thread.VMThreads;
-
 public class LLVMLoadExceptionObjectLowering implements NodeLoweringProvider<LoadExceptionObjectNode> {
 
     @Override
@@ -46,7 +46,7 @@ public void lower(LoadExceptionObjectNode node, LoweringTool tool) {
 
         StructuredGraph graph = node.graph();
         GraalError.guarantee(graph.getGuardsStage().areFrameStatesAtDeopts(), "Should be after FSA %s", node);
-        FixedWithNextNode readRegNode = graph.add(new ReadExceptionObjectNode(StampFactory.objectNonNull()));
+        FixedWithNextNode readRegNode = graph.add(new ReadExceptionObjectNode(node.stamp(NodeView.DEFAULT)));
         graph.replaceFixedWithFixed(node, readRegNode);
 
         /*

diff --git a/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java b/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java
@@ -44,9 +44,9 @@
 
 import jdk.graal.compiler.api.replacements.Snippet;
 import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
-import jdk.graal.compiler.core.common.type.StampFactory;
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.UnwindNode;
 import jdk.graal.compiler.nodes.java.LoadExceptionObjectNode;
@@ -111,7 +111,7 @@ public static class LoadExceptionObjectLowering implements NodeLoweringProvider<
         @Override
         public void lower(LoadExceptionObjectNode node, LoweringTool tool) {
             StructuredGraph graph = node.graph();
-            FixedWithNextNode readRegNode = graph.add(new ReadExceptionObjectNode(StampFactory.objectNonNull()));
+            FixedWithNextNode readRegNode = graph.add(new ReadExceptionObjectNode(node.stamp(NodeView.DEFAULT)));
             graph.replaceFixedWithFixed(node, readRegNode);
         }
     }