Mercurial > hg > truffle

changeset 9680:f7148150ae37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Relax kind equality assertions in LIRGenerator.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 14 May 2013 09:20:48 +0200
parents 661dfb29b59b
children f95f178b58c2 5a7a421aebfb cf0e31151830
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java	Tue May 14 09:20:40 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java	Tue May 14 09:20:48 2013 +0200
@@ -169,11 +169,10 @@
 
     @Override
     public Value setResult(ValueNode x, Value operand) {
-        assert (!isVariable(operand) || x.kind() == operand.getKind()) : operand.getKind() + " for node " + x;
         assert (!isRegister(operand) || !attributes(asRegister(operand)).isAllocatable());
         assert operand(x) == null : "operand cannot be set twice";
         assert operand != null && isLegal(operand) : "operand must be legal";
-        assert operand.getKind().getStackKind() == x.kind() : operand.getKind().getStackKind() + " must match " + x.kind();
+        assert operand.getKind().getStackKind() == x.kind() || x.kind() == Kind.Illegal : operand.getKind().getStackKind() + " must match " + x.kind();
         assert !(x instanceof VirtualObjectNode);
         nodeOperands.set(x, operand);
         return operand;