diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Combined.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Combined.java index 10763d0c798f..a17c1e5f9dee 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Combined.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Combined.java @@ -410,7 +410,7 @@ final class CombinedInterpreter extends BasicInterpreter { break; default: } - return super.ternaryOperation(insn, value1, value2, value3); + return null; } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Contracts.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Contracts.java index c9b230e2d719..73972871ee7b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Contracts.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Contracts.java @@ -397,7 +397,7 @@ class InOutInterpreter extends BasicInterpreter { } default: } - return super.ternaryOperation(insn, value1, value2, value3); + return null; } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Parameters.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Parameters.java index 69f6384bc31d..6102c44792bf 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Parameters.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Parameters.java @@ -707,7 +707,7 @@ abstract class NullityInterpreter extends BasicInterpreter { break; default: } - return super.ternaryOperation(insn, value1, value2, value3); + return null; } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/asm/LeakingParameters.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/asm/LeakingParameters.java index 1a7ab15722f9..97b129b9c774 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/asm/LeakingParameters.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/asm/LeakingParameters.java @@ -262,7 +262,7 @@ class ParametersUsage extends Interpreter { @Override public ParamsValue ternaryOperation(AbstractInsnNode insn, ParamsValue value1, ParamsValue value2, ParamsValue value3) { - return val1; + return null; } @Override @@ -458,7 +458,7 @@ class IParametersUsage extends Interpreter { break; default: } - return val1; + return null; } @Override @@ -560,6 +560,7 @@ class LeakingParametersCollector extends ParametersUsage { @Override public ParamsValue ternaryOperation(AbstractInsnNode insn, ParamsValue value1, ParamsValue value2, ParamsValue value3) { + boolean[] params; switch (insn.getOpcode()) { case IASTORE: case LASTORE: @@ -568,7 +569,7 @@ class LeakingParametersCollector extends ParametersUsage { case BASTORE: case CASTORE: case SASTORE: - boolean[] params = value1.params; + params = value1.params; for (int i = 0; i < arity; i++) { leaking[i] |= params[i]; } @@ -585,7 +586,7 @@ class LeakingParametersCollector extends ParametersUsage { break; default: } - return super.ternaryOperation(insn, value1, value2, value3); + return null; } @Override