Revert: [rollback] NotNullValues mustn't end up in equivalence classes table. (Check SliceTreeTest next time) (dec4450)

This commit is contained in:
peter
2012-04-18 12:07:42 +02:00
parent 8a6f6f7a9d
commit afb17f31a1
2 changed files with 4 additions and 5 deletions
@@ -577,21 +577,20 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
return true;
}
/*
if (dfaRight instanceof DfaNotNullValue) {
if (dfaLeft instanceof DfaVariableValue) {
DfaVariableState varState = getVariableState((DfaVariableValue)dfaLeft);
DfaVariableValue dfaVar = (DfaVariableValue)dfaLeft;
DfaTypeValue type = myFactory.getTypeFactory().create(((DfaNotNullValue)dfaRight).getType());
if (isNegated) {
return varState.addNotInstanceofValue(type) || applyCondition(compareToNull(dfaVar, false));
return varState.addNotInstanceofValue(type) ||
applyCondition(myFactory.getRelationFactory().create(dfaVar, DfaUnknownValue.getInstance(), JavaTokenType.EQEQ, false));
}
return applyCondition(compareToNull(dfaVar, true)) && varState.setInstanceofValue(type);
return applyCondition(compareToNull(dfaVar, false)) && varState.setInstanceofValue(type);
}
return true;
}
*/
if (dfaRight == myFactory.getConstFactory().getNull() && dfaLeft instanceof DfaVariableValue) {
final DfaVariableState varState = getVariableState((DfaVariableValue)dfaLeft);