Make sure stamp does not get less precise when applying Graph effects…

… from read elimination and PEA.
ZhangTongLe · Feb 13, 2017 · 5598d39 · 5598d39
1 parent bdd86ff
commit 5598d39
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/....graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java b/....graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java
@@ -31,8 +31,10 @@
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.PhiNode;
+import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.ValuePhiNode;
 import org.graalvm.compiler.nodes.debug.DynamicCounterNode;
 import org.graalvm.compiler.nodes.debug.WeakCounterNode;
 import org.graalvm.compiler.nodes.util.GraphUtil;
@@ -220,6 +222,12 @@ public void replaceAtUsages(ValueNode node, ValueNode replacement, FixedNode ins
             if (replacementNode instanceof FixedWithNextNode && ((FixedWithNextNode) replacementNode).next() == null) {
                 graph.addBeforeFixed(insertBefore, (FixedWithNextNode) replacementNode);
             }
+            if (replacementNode instanceof ValuePhiNode) {
+                ValuePhiNode valuePhiNode = (ValuePhiNode) replacementNode;
+                if (!node.stamp().equals(valuePhiNode.stamp())) {
+                    replacementNode = graph.unique(new PiNode(replacementNode, node.stamp()));
+                }
+            }
             node.replaceAtUsages(replacementNode);
             if (node instanceof FixedWithNextNode) {
                 GraphUtil.unlinkFixedNode((FixedWithNextNode) node);