[GR-33248] Fix DerivedConvertedInductionVariable zero extend

PullRequest: graal/9821
rkennke · Sep 22, 2021 · 2335ce8 · 2335ce8
2 parents 091d31a + 241163d
commit 2335ce8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java b/...compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
@@ -53,12 +53,12 @@ public Direction direction() {
 
     @Override
     public ValueNode initNode() {
-        return op(base.initNode());
+        return op(base.initNode(), true);
     }
 
     @Override
     public ValueNode strideNode() {
-        return op(base.strideNode());
+        return op(base.strideNode(), false);
     }
 
     @Override
@@ -88,7 +88,7 @@ public ValueNode extremumNode(boolean assumeLoopEntered, Stamp s) {
 
     @Override
     public ValueNode exitValueNode() {
-        return op(base.exitValueNode());
+        return op(base.exitValueNode(), true);
     }
 
     @Override
@@ -105,8 +105,8 @@ public long constantExtremum() {
     public void deleteUnusedNodes() {
     }
 
-    public ValueNode op(ValueNode v) {
-        boolean zeroExtend = value instanceof ZeroExtendNode;
+    private ValueNode op(ValueNode v, boolean allowZeroExtend) {
+        boolean zeroExtend = allowZeroExtend && value instanceof ZeroExtendNode;
         return IntegerConvertNode.convert(v, stamp, zeroExtend, graph(), NodeView.DEFAULT);
     }
 
@@ -122,7 +122,7 @@ public InductionVariable copy(InductionVariable newBase, ValueNode newValue) {
 
     @Override
     public ValueNode copyValue(InductionVariable newBase) {
-        return op(newBase.valueNode());
+        return op(newBase.valueNode(), true);
     }
 
 }