changeset 22163:07123623b5e1

SpillMoveFactoryBase#checkResult: allow constant input unconditionally.
author Josef Eisl <josef.eisl@jku.at>
date Tue, 07 Jul 2015 18:21:01 +0200
parents 72fa6c115a9b
children dc9761fa03d7
files graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/SpillMoveFactoryBase.java
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/SpillMoveFactoryBase.java	Tue Jul 07 16:05:01 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/SpillMoveFactoryBase.java	Tue Jul 07 18:21:01 2015 +0200
@@ -23,6 +23,7 @@
 package com.oracle.graal.lir.gen;
 
 import static com.oracle.graal.lir.LIRValueUtil.*;
+import static jdk.internal.jvmci.code.ValueUtil.*;
 
 import java.util.*;
 
@@ -92,7 +93,7 @@
         }
 
         void inputProc(LIRInstruction op, Value value, OperandMode mode, EnumSet<OperandFlag> flags) {
-            assert value.equals(input) : String.format("SpillMoveFactory: Instruction %s can only have %s as input, got %s", op, input, value);
+            assert value.equals(input) || isConstant(value) : String.format("SpillMoveFactory: Instruction %s can only have %s as input, got %s", op, input, value);
             inputCount++;
         }