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

Array initializer handling: fix execution order

Browse Source
This commit is contained in:
Tagir Valeev
2017-09-21 10:16:34 +07:00
parent 1e8bbf597a
commit e7fb59bd32
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+25 -18
View File
@@ -1606,23 +1606,17 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
if (var == null) {
var = getFactory().getVarFactory().createVariableValue(createTempVariable(type), false);
}
addInstruction(new PushInstruction(var, null, true));
addInstruction(new PushInstruction(getFactory().createTypeValue(type, Nullness.NOT_NULL), expression));
addInstruction(new AssignInstruction(expression, var)); // var remains on stack as an instruction result
final PsiExpression[] dimensions = expression.getArrayDimensions();
boolean sizeAssigned = false;
DfaValue length = SpecialField.ARRAY_LENGTH.createValue(getFactory(), var);
addInstruction(new PushInstruction(length, null, true));
// stack: ... var.length
final PsiExpression[] dimensions = expression.getArrayDimensions();
boolean sizeOnStack = false;
for (final PsiExpression dimension : dimensions) {
if (!sizeAssigned) {
addInstruction(new PushInstruction(length, null, true));
dimension.accept(this);
addInstruction(new AssignInstruction(dimension, null));
sizeAssigned = true;
dimension.accept(this);
if (sizeOnStack) {
addInstruction(new PopInstruction());
}
else {
dimension.accept(this);
}
addInstruction(new PopInstruction());
sizeOnStack = true;
}
final PsiArrayInitializerExpression arrayInitializer = expression.getArrayInitializer();
if (arrayInitializer != null) {
@@ -1634,11 +1628,24 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
}
}
processArrayInitializers(arrayInitializer, ((PsiArrayType)type).getComponentType(), nullability);
addInstruction(new PushInstruction(length, null, true));
addInstruction(new PushInstruction(getFactory().getInt(arrayInitializer.getInitializers().length), null));
addInstruction(new AssignInstruction(null, null));
addInstruction(new PopInstruction());
if (!sizeOnStack) {
sizeOnStack = true;
addInstruction(new PushInstruction(getFactory().getInt(arrayInitializer.getInitializers().length), null));
}
}
if (!sizeOnStack) {
pushUnknown();
}
// stack: ... var.length actual_size
addInstruction(new PushInstruction(var, null, true));
addInstruction(new PushInstruction(getFactory().createTypeValue(type, Nullness.NOT_NULL), expression));
addInstruction(new AssignInstruction(expression, var));
// stack: ... var.length actual_size var
addInstruction(new SpliceInstruction(3, 0, 2, 1));
// stack: ... var var.length actual_size
addInstruction(new AssignInstruction(null, length));
addInstruction(new PopInstruction());
// stack: ... var
}
else {
pushUnknown(); // qualifier
java/java-tests/testData/inspection/dataFlow/fixture/ArrayInitializerLength.java
+8
View File
@@ -52,4 +52,12 @@ class ArrayInitializerLength {
System.out.println("not ok");
}
}
void testExecutionOrder(Object obj) {
if(obj instanceof String) {
// should not warn about possible CCE
obj = new String[] {(String)obj};
}
System.out.println(obj);
}
}