MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

some dfa simplifications not affecting tests

Browse Source
This commit is contained in:
peter
2013-09-10 14:13:18 +02:00
parent 9d042245fd
commit 7d3f4f255a
7 changed files with 15 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java
+5 -16
View File
@@ -610,7 +610,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
private boolean applyRelationCondition(DfaRelationValue dfaRelation) {
DfaValue dfaLeft = dfaRelation.getLeftOperand();
DfaValue dfaRight = dfaRelation.getRightOperand();
if (dfaRight == null || dfaLeft == null) return false;
if (dfaLeft instanceof DfaUnknownValue || dfaRight instanceof DfaUnknownValue) return true;
boolean isNegated = dfaRelation.isNegated();
if (dfaLeft instanceof DfaNotNullValue && dfaRight == myFactory.getConstFactory().getNull()) {
@@ -637,9 +637,6 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
return isNegated;
}
if (dfaLeft instanceof DfaUnknownValue || dfaRight instanceof DfaUnknownValue) return true;
if (isEffectivelyNaN(dfaLeft) || isEffectivelyNaN(dfaRight)) {
applyEquivalenceRelation(dfaRelation, dfaLeft, dfaRight);
return isNegated;
@@ -773,22 +770,14 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
if (value instanceof DfaTypeValue && ((DfaTypeValue)value).isNullable()) return false;
if (value instanceof DfaVariableValue) {
if (isNotNull((DfaVariableValue)value)) return true;
final DfaVariableState varState = getVariableState((DfaVariableValue)value);
if (varState.isNullable()) return false;
DfaVariableValue varValue = (DfaVariableValue)value;
if (varValue.getVariableType() instanceof PsiPrimitiveType) return true;
if (isNotNull(varValue)) return true;
if (getVariableState(varValue).isNullable()) return false;
}
return true;
}
@Override
public boolean applyNotNull(DfaValue value) {
if (value instanceof DfaVariableValue && ((DfaVariableValue)value).getVariableType() instanceof PsiPrimitiveType) {
return true;
}
return checkNotNullable(value) && applyCondition(compareToNull(value, true));
}
@Nullable
private DfaRelationValue compareToNull(DfaValue dfaVar, boolean negated) {
DfaConstValue dfaNull = myFactory.getConstFactory().getNull();