This commit is contained in:
Julian Dolby 2017-08-22 18:05:59 -04:00
commit 2d829a339e
1 changed files with 4 additions and 3 deletions

View File

@ -727,8 +727,8 @@ public class TypeInference extends SSAInference<TypeVariable> implements FixedPo
@Override
public IVariable makeVariable(int valueNumber) {
SymbolTable st = ir.getSymbolTable();
if (doPrimitives) {
SymbolTable st = ir.getSymbolTable();
if (st.isConstant(valueNumber)) {
if (st.isBooleanConstant(valueNumber)) {
return new TypeVariable(language.getPrimitive(language.getConstantType(Boolean.TRUE)));
@ -752,8 +752,9 @@ public class TypeInference extends SSAInference<TypeVariable> implements FixedPo
if (valueNumber < 0) {
throw new IllegalArgumentException("bad value number " + valueNumber);
}
assert getVariable(valueNumber) != null : "null variable for value number " + valueNumber;
return getVariable(valueNumber).getType();
TypeVariable variable = getVariable(valueNumber);
assert variable != null : "null variable for value number " + valueNumber;
return variable.getType();
}
public TypeAbstraction getConstantType(int valueNumber) {