azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pseudocode: Generate instructions for unresolved array assignments

Browse Source
This commit is contained in:
Alexey Sedunov
2014-10-06 16:35:16 +04:00
parent b06b3ab4c4
commit a56c54371e
12 changed files with 220 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+6 -5
View File
@@ -490,6 +490,10 @@ public class JetControlFlowProcessor {
if (setResolvedCall == null) {
generateArrayAccess(lhs, null);
List<PseudoValue> arguments = Arrays.asList(getBoundOrUnreachableValue(lhs), rhsDeferredValue.invoke());
builder.magic(parentExpression, parentExpression, arguments, defaultTypeMap(arguments), MagicKind.UNRESOLVED_CALL);
return;
}
@@ -570,6 +574,7 @@ public class JetControlFlowProcessor {
}
private void generateArrayAccess(JetArrayAccessExpression arrayAccessExpression, @Nullable ResolvedCall<?> resolvedCall) {
if (builder.getBoundValue(arrayAccessExpression) != null) return;
mark(arrayAccessExpression);
if (!checkAndGenerateCall(arrayAccessExpression, resolvedCall)) {
generateArrayAccessWithoutCall(arrayAccessExpression);
@@ -1276,11 +1281,7 @@ public class JetControlFlowProcessor {
@Override
public void visitArrayAccessExpression(@NotNull JetArrayAccessExpression expression) {
mark(expression);
ResolvedCall<FunctionDescriptor> getMethodResolvedCall = trace.get(BindingContext.INDEXED_LVALUE_GET, expression);
if (!checkAndGenerateCall(expression, getMethodResolvedCall)) {
generateArrayAccess(expression, getMethodResolvedCall);
}
generateArrayAccess(expression, trace.get(BindingContext.INDEXED_LVALUE_GET, expression));
}
@Override
compiler/testData/cfg/arrays/arrayIncUnresolved.instructions
+38
View File
@@ -0,0 +1,38 @@
== A ==
class A
---------------------
L0:
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== foo ==
fun foo(a: A) {
a[0]++
}
---------------------
L0:
1 <START>
v(a: A)
magic[FAKE_INITIALIZER](a: A) -> <v0>
w(a|<v0>)
2 mark({ a[0]++ })
mark(a[0])
error(a[0], No resolved call)
r(a) -> <v1>
r(0) -> <v2>
magic[UNRESOLVED_CALL](a[0]|<v1>, <v2>) -> <v3>
mark(a[0]++)
call(a[0]++, <ERROR FUNCTION>|<v3>) -> <v4>
magic[UNRESOLVED_CALL](a[0]++|<v3>, <v4>) -> <v5>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/arrays/arrayIncUnresolved.kt
+5
View File
@@ -0,0 +1,5 @@
class A
fun foo(a: A) {
a[0]++
}
compiler/testData/cfg/arrays/arrayIncUnresolved.values
+16
View File
@@ -0,0 +1,16 @@
== A ==
class A
---------------------
=====================
== foo ==
fun foo(a: A) {
a[0]++
}
---------------------
<v0>: A NEW: magic[FAKE_INITIALIZER](a: A) -> <v0>
a <v1>: * NEW: r(a) -> <v1>
0 <v2>: * NEW: r(0) -> <v2>
a[0] <v3>: * NEW: magic[UNRESOLVED_CALL](a[0]|<v1>, <v2>) -> <v3>
a[0]++ <v3>: * COPY
{ a[0]++ } <v3>: * COPY
=====================
compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.instructions
+38
View File
@@ -0,0 +1,38 @@
== A ==
class A
---------------------
L0:
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== foo ==
fun foo(a: A) {
a[0] += 1
}
---------------------
L0:
1 <START>
v(a: A)
magic[FAKE_INITIALIZER](a: A) -> <v0>
w(a|<v0>)
2 mark({ a[0] += 1 })
mark(a[0])
error(a[0], No resolved call)
r(a) -> <v1>
r(0) -> <v2>
magic[UNRESOLVED_CALL](a[0]|<v1>, <v2>) -> <v3>
r(1) -> <v4>
magic[UNRESOLVED_CALL](a[0] += 1|<v3>, <v4>) -> <v5>
mark(a[0] += 1)
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.kt
+5
View File
@@ -0,0 +1,5 @@
class A
fun foo(a: A) {
a[0] += 1
}
compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.values
+17
View File
@@ -0,0 +1,17 @@
== A ==
class A
---------------------
=====================
== foo ==
fun foo(a: A) {
a[0] += 1
}
---------------------
<v0>: A NEW: magic[FAKE_INITIALIZER](a: A) -> <v0>
a <v1>: * NEW: r(a) -> <v1>
0 <v2>: * NEW: r(0) -> <v2>
a[0] <v3>: * NEW: magic[UNRESOLVED_CALL](a[0]|<v1>, <v2>) -> <v3>
1 <v4>: * NEW: r(1) -> <v4>
a[0] += 1 <v5>: * NEW: magic[UNRESOLVED_CALL](a[0] += 1|<v3>, <v4>) -> <v5>
{ a[0] += 1 } <v5>: * COPY
=====================
compiler/testData/cfg/arrays/arraySetUnresolved.instructions
+37
View File
@@ -0,0 +1,37 @@
== A ==
class A
---------------------
L0:
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== foo ==
fun foo(a: A) {
a[1] = 2
}
---------------------
L0:
1 <START>
v(a: A)
magic[FAKE_INITIALIZER](a: A) -> <v0>
w(a|<v0>)
2 mark({ a[1] = 2 })
mark(a[1])
error(a[1], No resolved call)
r(a) -> <v1>
r(1) -> <v2>
magic[UNRESOLVED_CALL](a[1]|<v1>, <v2>) -> <v3>
r(2) -> <v4>
magic[UNRESOLVED_CALL](a[1] = 2|<v3>, <v4>) -> <v5>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/arrays/arraySetUnresolved.kt
+5
View File
@@ -0,0 +1,5 @@
class A
fun foo(a: A) {
a[1] = 2
}
compiler/testData/cfg/arrays/arraySetUnresolved.values
+17
View File
@@ -0,0 +1,17 @@
== A ==
class A
---------------------
=====================
== foo ==
fun foo(a: A) {
a[1] = 2
}
---------------------
<v0>: A NEW: magic[FAKE_INITIALIZER](a: A) -> <v0>
a <v1>: * NEW: r(a) -> <v1>
1 <v2>: * NEW: r(1) -> <v2>
a[1] <v3>: * NEW: magic[UNRESOLVED_CALL](a[1]|<v1>, <v2>) -> <v3>
2 <v4>: * NEW: r(2) -> <v4>
a[1] = 2 <v5>: * NEW: magic[UNRESOLVED_CALL](a[1] = 2|<v3>, <v4>) -> <v5>
{ a[1] = 2 } <v5>: * COPY
=====================
compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java
+18
View File
@@ -65,6 +65,12 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
doTest(fileName);
}
@TestMetadata("arrayIncUnresolved.kt")
public void testArrayIncUnresolved() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayIncUnresolved.kt");
doTest(fileName);
}
@TestMetadata("ArrayOfFunctions.kt")
public void testArrayOfFunctions() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
@@ -83,6 +89,18 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
doTest(fileName);
}
@TestMetadata("arraySetPlusAssignUnresolved.kt")
public void testArraySetPlusAssignUnresolved() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.kt");
doTest(fileName);
}
@TestMetadata("arraySetUnresolved.kt")
public void testArraySetUnresolved() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetUnresolved.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/cfg/basic")
compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java
+18
View File
@@ -68,6 +68,12 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
doTest(fileName);
}
@TestMetadata("arrayIncUnresolved.kt")
public void testArrayIncUnresolved() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayIncUnresolved.kt");
doTest(fileName);
}
@TestMetadata("ArrayOfFunctions.kt")
public void testArrayOfFunctions() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
@@ -86,6 +92,18 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
doTest(fileName);
}
@TestMetadata("arraySetPlusAssignUnresolved.kt")
public void testArraySetPlusAssignUnresolved() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.kt");
doTest(fileName);
}
@TestMetadata("arraySetUnresolved.kt")
public void testArraySetUnresolved() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetUnresolved.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/cfg/basic")