diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java index 5fa003b189de..e245c6e8dfbe 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java @@ -349,9 +349,6 @@ public class StandardInstructionVisitor extends InstructionVisitor { return null; } - if (isViaMethods(dfaLeft) || isViaMethods(dfaRight)) { - skipConstantConditionReporting(instruction.getPsiAnchor()); - } myCanBeNullInInstanceof.add(instruction); ArrayList states = new ArrayList(); @@ -387,10 +384,6 @@ public class StandardInstructionVisitor extends InstructionVisitor { ContainerUtil.addIfNotNull(myNotToReportReachability, anchor); } - private static boolean isViaMethods(DfaValue dfa) { - return dfa instanceof DfaVariableValue && ((DfaVariableValue)dfa).isViaMethods(); - } - private void handleInstanceof(InstanceofInstruction instruction, DfaValue dfaRight, DfaValue dfaLeft) { if (dfaLeft instanceof DfaTypeValue && dfaRight instanceof DfaTypeValue) { if (!((DfaTypeValue)dfaLeft).isNotNull()) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java index 72a912b5d840..1ec6a26d440f 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java @@ -143,10 +143,6 @@ public class DfaVariableValue extends DfaValue { return myQualifier; } - public boolean isViaMethods() { - return myVariable instanceof PsiMethod || myQualifier != null && myQualifier.isViaMethods(); - } - public Nullness getInherentNullability() { if (myInherentNullability != null) { return myInherentNullability;