MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

DfaMemoryStateImpl: fix internal structures

Browse Source
This commit is contained in:
Tagir Valeev
2017-05-26 14:43:48 +07:00
parent b40e45be89
commit c5ea3f1144
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java
View File

@@ -300,27 +300,6 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
private Integer getOrCreateEqClassIndex(@NotNull DfaValue dfaValue) {
int i = getEqClassIndex(dfaValue);
if (i != -1) return i;
if (dfaValue instanceof DfaVariableValue) {
DfaVariableValue variableValue = (DfaVariableValue)dfaValue;
DfaVariableValue qualifier = variableValue.getQualifier();
PsiModifierListOwner variable = variableValue.getPsiVariable();
if (qualifier != null) {
Integer index = getOrCreateEqClassIndex(qualifier);
if (index != null) {
for (DfaValue eqQualifier : myEqClasses.get(index).getMemberValues()) {
if (eqQualifier != qualifier && eqQualifier instanceof DfaVariableValue) {
DfaVariableValue eqValue = getFactory().getVarFactory()
.createVariableValue(variable, variableValue.getVariableType(), variableValue.isNegated(), (DfaVariableValue)eqQualifier);
i = getEqClassIndex(eqValue);
if (i != -1) {
myEqClasses.get(i).add(dfaValue.getID());
return i;
}
}
}
}
}
}
if (!canBeInRelation(dfaValue) ||
!canBeReused(dfaValue) && !(((DfaBoxedValue)dfaValue).getWrappedValue() instanceof DfaConstValue)) {
return null;
@@ -338,6 +317,28 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
}
addToMap(dfaValue.getID(), resultIndex);
if (dfaValue instanceof DfaVariableValue) {
DfaVariableValue variableValue = (DfaVariableValue)dfaValue;
DfaVariableValue qualifier = variableValue.getQualifier();
PsiModifierListOwner variable = variableValue.getPsiVariable();
if (qualifier != null) {
Integer index = getOrCreateEqClassIndex(qualifier);
if (index != null) {
for (DfaValue eqQualifier : myEqClasses.get(index).getMemberValues()) {
if (eqQualifier != qualifier && eqQualifier instanceof DfaVariableValue) {
DfaVariableValue eqValue = getFactory().getVarFactory()
.createVariableValue(variable, variableValue.getVariableType(), variableValue.isNegated(), (DfaVariableValue)eqQualifier);
i = getEqClassIndex(eqValue);
if (i != -1) {
uniteClasses(i, resultIndex);
return i;
}
}
}
}
}
}
return resultIndex;
}