Mercurial > hg > graal-compiler

changeset 23270:1375f94fdf30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix: node must be added to graph before it can be an input for a phi function
author Christian Wimmer <christian.wimmer@oracle.com>
date Thu, 07 Jan 2016 08:33:16 -0800
parents 52f1bd96653f
children 8b7b4f1e3274
files graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java	Thu Jan 07 15:00:09 2016 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java	Thu Jan 07 08:33:16 2016 -0800
@@ -384,7 +384,7 @@
             if (otherValue == null || otherValue == TWO_SLOT_MARKER || otherValue.isDeleted() || currentValue.getStackKind() != otherValue.getStackKind()) {
                 // This phi must be dead anyway, add input of correct stack kind to keep the graph
                 // invariants.
-                ((PhiNode) currentValue).addInput(ConstantNode.defaultForKind(currentValue.getStackKind()));
+                ((PhiNode) currentValue).addInput(ConstantNode.defaultForKind(currentValue.getStackKind(), graph));
             } else {
                 ((PhiNode) currentValue).addInput(otherValue);
             }