This commit is contained in:
peter
2013-09-29 11:30:29 +02:00
parent 5f8e1c82d9
commit ee9b1f818a
2 changed files with 4 additions and 4 deletions
@@ -817,14 +817,14 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
}
}
}
for (DfaVariableValue value : new ArrayList<DfaVariableValue>(getChangedVariable())) {
for (DfaVariableValue value : new ArrayList<DfaVariableValue>(getChangedVariables())) {
if (value.isFlushableByCalls()) {
doFlush(value, true);
}
}
}
Set<DfaVariableValue> getChangedVariable() {
Set<DfaVariableValue> getChangedVariables() {
return myVariableStates.keySet();
}
@@ -144,7 +144,7 @@ class StateMerger {
MultiMap<Pair<DfaVariableValue, DfaPsiType>,DfaMemoryStateImpl> byInstanceof = new MultiMap<Pair<DfaVariableValue, DfaPsiType>, DfaMemoryStateImpl>();
for (final DfaMemoryStateImpl state : states) {
ProgressManager.checkCanceled();
for (DfaVariableValue value : state.getChangedVariable()) {
for (DfaVariableValue value : state.getChangedVariables()) {
for (DfaPsiType instanceofValue : state.getVariableState(value).myInstanceofValues) {
byInstanceof.putValue(Pair.create(value, instanceofValue), state);
}
@@ -154,7 +154,7 @@ class StateMerger {
for (final DfaMemoryStateImpl state : states) {
ProgressManager.checkCanceled();
for (final DfaVariableValue var : state.getChangedVariable()) {
for (final DfaVariableValue var : state.getChangedVariables()) {
for (final DfaPsiType notInstanceof : state.getVariableState(var).myNotInstanceofValues) {
final DfaVariableState varStateWithoutType = getVarStateWithoutType(state, var, notInstanceof);
List<DfaMemoryStateImpl> complementaryStates = ContainerUtil.filter(