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

cleanup silly dfa class distinctions (e.g. ({1},{2}))

Browse Source
This commit is contained in:
peter
2012-04-18 19:28:41 +02:00
parent c1ef4bf5b6
commit dc9a6b2d18
3 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java
+23 -3
View File
@@ -101,7 +101,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
public boolean equals(Object obj) {
if (obj == this) return true;
if (!(obj instanceof DfaMemoryState)) return false;
if (!(obj instanceof DfaMemoryStateImpl)) return false;
DfaMemoryStateImpl that = (DfaMemoryStateImpl)obj;
if (myStateSize != that.myStateSize) return false;
@@ -693,14 +693,12 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
}
public boolean applyNotNull(DfaValue value) {
/*
if (value instanceof DfaVariableValue) {
PsiVariable variable = ((DfaVariableValue)value).getPsiVariable();
if (variable != null && variable.getType() instanceof PsiPrimitiveType) {
return true;
}
}
*/
return checkNotNullable(value) && applyCondition(compareToNull(value, true));
}
@@ -795,12 +793,34 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
}
}
}
else if (containsConstantsOnly(varClassIndex)) {
for (long pair : myDistinctClasses.toArray()) {
if (low(pair) == varClassIndex && containsConstantsOnly(high(pair)) ||
high(pair) == varClassIndex && containsConstantsOnly(low(pair))) {
myDistinctClasses.remove(pair);
}
}
}
}
myVariableStates.remove(varPlain);
myVariableStates.remove(varNegated);
}
private boolean containsConstantsOnly(int id) {
SortedIntSet varClass = myEqClasses.get(id);
for (int i = 0; i < varClass.size(); i++) {
int cl = varClass.get(i);
DfaValue value = myFactory.getValue(cl);
if (!(value instanceof DfaConstValue) &&
!(value instanceof DfaBoxedValue && ((DfaBoxedValue)value).getWrappedValue() instanceof DfaConstValue)) {
return false;
}
}
return true;
}
private static boolean mine(int id, DfaValue value) {
return value != null && id == value.getID() ||
value instanceof DfaBoxedValue && ((DfaBoxedValue)value).getWrappedValue().getID() == id ||