From 514b33e771934a2100672f56e8e468d1d6844d1c Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 26 May 2017 13:07:59 +0700 Subject: [PATCH] DfaMemoryStateImpl: removed obsolete code --- .../dataFlow/DfaMemoryStateImpl.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java index 9d80870ecf86..ffa4ac9ef93e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java @@ -953,10 +953,6 @@ public class DfaMemoryStateImpl implements DfaMemoryState { } else { // Not Equals if (c1Index.equals(c2Index) || areCompatibleConstants(c1Index, c2Index)) return false; - //if (dfaLeft instanceof DfaVariableValue && dfaRight instanceof DfaVariableValue && - // equalsByQualifier((DfaVariableValue)dfaLeft, (DfaVariableValue)dfaRight)) { - // return false; - //} if (isNull(dfaLeft) && isPrimitive(dfaRight) || isNull(dfaRight) && isPrimitive(dfaLeft)) return true; makeClassesDistinct(c1Index, c2Index); myCachedDistinctClassPairs = null; @@ -966,18 +962,6 @@ public class DfaMemoryStateImpl implements DfaMemoryState { return true; } - private boolean equalsByQualifier(@NotNull DfaVariableValue dfaLeft, @NotNull DfaVariableValue dfaRight) { - if (dfaLeft.getPsiVariable() != dfaRight.getPsiVariable()) return false; - DfaVariableValue leftQualifier = dfaLeft.getQualifier(); - DfaVariableValue rightQualifier = dfaRight.getQualifier(); - if (leftQualifier == null || rightQualifier == null) return false; - Integer c1QualifierIndex = getOrCreateEqClassIndex(leftQualifier); - Integer c2QualifierIndex = getOrCreateEqClassIndex(rightQualifier); - // Equal qualifiers == equal values - if (c1QualifierIndex != null && c1QualifierIndex.equals(c2QualifierIndex)) return true; - return equalsByQualifier(leftQualifier, rightQualifier); - } - private static boolean isPrimitive(DfaValue value) { return value instanceof DfaVariableValue && ((DfaVariableValue)value).getVariableType() instanceof PsiPrimitiveType; }