Control-Flow Analysis: Fix NPE for array assignments without right-hand side
#EA-63602 Fixed
This commit is contained in:
@@ -485,7 +485,9 @@ public class JetControlFlowProcessor {
|
||||
if (setResolvedCall == null) {
|
||||
generateArrayAccess(lhs, null);
|
||||
|
||||
List<PseudoValue> arguments = Arrays.asList(getBoundOrUnreachableValue(lhs), rhsDeferredValue.invoke());
|
||||
List<PseudoValue> arguments = KotlinPackage.filterNotNull(
|
||||
Arrays.asList(getBoundOrUnreachableValue(lhs), rhsDeferredValue.invoke())
|
||||
);
|
||||
builder.magic(parentExpression, parentExpression, arguments, defaultTypeMap(arguments), MagicKind.UNRESOLVED_CALL);
|
||||
|
||||
return;
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
== foo ==
|
||||
fun foo(a: Array<Int>) {
|
||||
a[1] =
|
||||
}
|
||||
---------------------
|
||||
L0:
|
||||
1 <START>
|
||||
v(a: Array<Int>)
|
||||
magic[FAKE_INITIALIZER](a: Array<Int>) -> <v0>
|
||||
w(a|<v0>)
|
||||
2 mark({ a[1] = })
|
||||
mark(a[1])
|
||||
magic[UNRESOLVED_CALL](a) -> <v1>
|
||||
r(1) -> <v2>
|
||||
magic[UNRESOLVED_CALL](a[1]|<v1>, <v2>) -> <v3>
|
||||
magic[UNRESOLVED_CALL](a[1] =|<v3>) -> <v4>
|
||||
L1:
|
||||
1 <END> NEXT:[<SINK>]
|
||||
error:
|
||||
<ERROR> PREV:[]
|
||||
sink:
|
||||
<SINK> PREV:[<ERROR>, <END>]
|
||||
=====================
|
||||
@@ -0,0 +1,3 @@
|
||||
fun foo(a: Array<Int>) {
|
||||
a[1] =
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
== foo ==
|
||||
fun foo(a: Array<Int>) {
|
||||
a[1] =
|
||||
}
|
||||
---------------------
|
||||
<v0>: {<: Array<Int>} NEW: magic[FAKE_INITIALIZER](a: Array<Int>) -> <v0>
|
||||
a <v1>: * NEW: magic[UNRESOLVED_CALL](a) -> <v1>
|
||||
1 <v2>: * NEW: r(1) -> <v2>
|
||||
a[1] <v3>: * NEW: magic[UNRESOLVED_CALL](a[1]|<v1>, <v2>) -> <v3>
|
||||
a[1] = <v4>: * NEW: magic[UNRESOLVED_CALL](a[1] =|<v3>) -> <v4>
|
||||
{ a[1] = } <v4>: * COPY
|
||||
=====================
|
||||
@@ -93,6 +93,12 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("arraySetNoRHS.kt")
|
||||
public void testArraySetNoRHS() throws Exception {
|
||||
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetNoRHS.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("arraySetPlusAssign.kt")
|
||||
public void testArraySetPlusAssign() throws Exception {
|
||||
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
|
||||
|
||||
@@ -99,6 +99,12 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("arraySetNoRHS.kt")
|
||||
public void testArraySetNoRHS() throws Exception {
|
||||
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetNoRHS.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("arraySetPlusAssign.kt")
|
||||
public void testArraySetPlusAssign() throws Exception {
|
||||
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
|
||||
|
||||
Reference in New Issue
Block a user