Mercurial > hg > truffle

changeset 18112:b78cab589013

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: relax assertion for non-int values in int phi
author Andreas Woess <andreas.woess@jku.at>
date Thu, 16 Oct 2014 15:31:36 +0200
parents 03259118b81b
children 8dbe2b479bc8
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java	Thu Oct 16 15:31:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java	Thu Oct 16 15:31:36 2014 +0200
@@ -24,6 +24,7 @@
 
 import java.util.*;
 
+import com.oracle.graal.api.meta.*;
 import com.oracle.graal.compiler.common.type.*;
 import com.oracle.graal.graph.*;
 import com.oracle.graal.graph.spi.*;
@@ -131,7 +132,7 @@
 
     public void addInput(ValueNode x) {
         assert !(x instanceof ValuePhiNode) || ((ValuePhiNode) x).merge() instanceof LoopBeginNode || ((ValuePhiNode) x).merge() != this.merge();
-        assert !(this instanceof ValuePhiNode) || x.stamp().isCompatible(stamp());
+        assert !(this instanceof ValuePhiNode) || x.stamp().isCompatible(stamp()) || (stamp().getStackKind() == Kind.Int && x.stamp().getStackKind().getBitCount() >= Kind.Int.getBitCount());
         values().add(x);
     }