MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-218061 Better support for string concatenation in dataflow

Browse Source 
GitOrigin-RevId: 8c29e3469c062b9125a3fe8f8e45d96a9390c67e
This commit is contained in:
Tagir Valeev
2019-07-11 07:02:35 +03:00
committed by intellij-monorepo-bot
parent d727002b99
commit d29aa4f8dd
4 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/CustomMethodHandlers.java
+1 -1
View File
@@ -40,7 +40,7 @@ class CustomMethodHandlers {
staticCall(JAVA_LANG_BYTE, "toString").parameterTypes("byte"),
staticCall(JAVA_LANG_SHORT, "toString").parameterTypes("short")
);
private static final int MAX_STRING_CONSTANT_LENGTH_TO_TRACK = 1024;
static final int MAX_STRING_CONSTANT_LENGTH_TO_TRACK = 256;
interface CustomMethodHandler {
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
+39 -6
View File
@@ -12,7 +12,6 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.ThreeState;
import com.siyeh.ig.psiutils.MethodUtils;
import com.siyeh.ig.psiutils.TypeUtils;
@@ -22,6 +21,8 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
import static com.intellij.util.ObjectUtils.tryCast;
/**
* @author peter
*/
@@ -199,7 +200,7 @@ public class StandardInstructionVisitor extends InstructionVisitor {
PsiMethod sam = LambdaUtil.getFunctionalInterfaceMethod(functionalInterfaceType);
if (sam == null || PsiType.VOID.equals(sam.getReturnType())) return;
JavaResolveResult resolveResult = methodRef.advancedResolve(false);
PsiMethod method = ObjectUtils.tryCast(resolveResult.getElement(), PsiMethod.class);
PsiMethod method = tryCast(resolveResult.getElement(), PsiMethod.class);
if (method == null || !JavaMethodContractUtil.isPure(method)) return;
List<? extends MethodContract> contracts = JavaMethodContractUtil.getMethodCallContracts(method, null);
PsiSubstitutor substitutor = resolveResult.getSubstitutor();
@@ -283,8 +284,7 @@ public class StandardInstructionVisitor extends InstructionVisitor {
beforeMethodCall(instruction.getExpression(), callArguments, runner, memState);
}
Set<DfaMemoryState> finalStates = new LinkedHashSet<>();
finalStates.addAll(handleKnownMethods(instruction, runner, memState, callArguments));
Set<DfaMemoryState> finalStates = new LinkedHashSet<>(handleKnownMethods(instruction, runner, memState, callArguments));
if (finalStates.isEmpty()) {
Set<DfaCallState> currentStates = Collections.singleton(new DfaCallState(memState, callArguments));
@@ -673,7 +673,7 @@ public class StandardInstructionVisitor extends InstructionVisitor {
result = runner.getFactory().getBinOpFactory().create(dfaLeft, dfaRight, memState, isLong, opSign);
}
if (result == DfaUnknownValue.getInstance() && JavaTokenType.PLUS == opSign && TypeUtils.isJavaLangString(type)) {
result = runner.getFactory().createTypeValue(type, Nullability.NOT_NULL);
result = concatStrings(dfaLeft, dfaRight, memState, type, runner.getFactory());
}
pushExpressionResult(result, instruction, memState);
@@ -683,6 +683,39 @@ public class StandardInstructionVisitor extends InstructionVisitor {
return nextInstruction(instruction, runner, memState);
}
@NotNull
private static DfaValue concatStrings(DfaValue left,
DfaValue right,
DfaMemoryState memState,
PsiType stringType,
DfaValueFactory factory) {
DfaConstValue leftConst = memState.getConstantValue(left);
DfaConstValue rightConst = memState.getConstantValue(right);
if (leftConst != null && rightConst != null) {
String leftString = tryCast(leftConst.getValue(), String.class);
String rightString = tryCast(rightConst.getValue(), String.class);
if (leftString != null && rightString != null &&
leftString.length() + rightString.length() <= CustomMethodHandlers.MAX_STRING_CONSTANT_LENGTH_TO_TRACK) {
return factory.getConstFactory().createFromValue(leftString + rightString, stringType);
}
}
DfaValue leftLength = SpecialField.STRING_LENGTH.createValue(factory, left);
DfaValue rightLength = SpecialField.STRING_LENGTH.createValue(factory, right);
LongRangeSet leftRange = memState.getValueFact(leftLength, DfaFactType.RANGE);
LongRangeSet rightRange = memState.getValueFact(rightLength, DfaFactType.RANGE);
DfaFactMap map = DfaFactMap.EMPTY
.with(DfaFactType.TYPE_CONSTRAINT, factory.createDfaType(stringType).asConstraint())
.with(DfaFactType.NULLABILITY, DfaNullability.NOT_NULL);
if (leftRange != null && rightRange != null) {
LongRangeSet resultRange = leftRange.plus(rightRange, false).intersect(LongRangeSet.indexRange());
if (!resultRange.equals(LongRangeSet.indexRange())) {
map = map.with(DfaFactType.SPECIAL_FIELD_VALUE,
SpecialField.STRING_LENGTH.withValue(factory.getFactValue(DfaFactType.RANGE, resultRange)));
}
}
return factory.getFactFactory().createValue(map);
}
@Nullable
private DfaInstructionState[] handleRelationBinop(BinopInstruction instruction,
DataFlowRunner runner,
@@ -772,7 +805,7 @@ public class StandardInstructionVisitor extends InstructionVisitor {
DfaValue condition = null;
if (instruction.isClassObjectCheck()) {
DfaConstValue constant = memState.getConstantValue(dfaRight);
PsiType type = constant == null ? null : ObjectUtils.tryCast(constant.getValue(), PsiType.class);
PsiType type = constant == null ? null : tryCast(constant.getValue(), PsiType.class);
if (type == null || type instanceof PsiPrimitiveType) {
// Unknown/primitive class: just execute contract "null -> false"
DfaConstValue aNull = factory.getConstFactory().getNull();
java/java-tests/testData/inspection/dataFlow/fixture/StringConcat.java
+16
View File
@@ -0,0 +1,16 @@
import java.util.*;
public class StringConcat {
void test(String s1, String s2) {
if (s1.equals("foo") && s2.equals("bar")) {
String res = s1 + s2;
if (<warning descr="Condition 'res.equals(\"foobar\")' is always 'true'">res.equals("foobar")</warning>) {
}
}
if (s1.startsWith("foo") && s2.startsWith("bar")) {
String res = s1 + s2;
if (<warning descr="Condition 'res.length() < 6' is always 'false'">res.length() < 6</warning>) {}
}
}
}
java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowRangeAnalysisTest.java
+1
View File
@@ -61,4 +61,5 @@ public class DataFlowRangeAnalysisTest extends DataFlowInspectionTestCase {
public void testModRange() { doTest(); }
public void testBackPropagationMod() { doTest(); }
public void testArithmeticNoOp() { doTest(); }
public void testStringConcat() { doTest(); }
}