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

Pseudocode: Generate fake values for Unit/Nothing-typed expressions

Browse Source
This commit is contained in:
Alexey Sedunov
2014-07-23 12:56:21 +04:00
parent 2d3ac9109b
commit 77bbf8f73b
72 changed files with 851 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg-variables/basic/IfWithUninitialized.instructions
+12 -11
View File
@@ -10,31 +10,32 @@ fun foo() {
}
---------------------
L0:
1 <START> INIT: in: {} out: {} USE: in: {} out: {}
1 <START> INIT: in: {} out: {} USE: in: {} out: {}
2 mark({ val b: Boolean if (1 < 2) { use(b) } else { b = true } })
v(val b: Boolean) INIT: in: {} out: {b=D}
mark(if (1 < 2) { use(b) } else { b = true }) INIT: in: {b=D} out: {b=D}
v(val b: Boolean) INIT: in: {} out: {b=D}
mark(if (1 < 2) { use(b) } else { b = true }) INIT: in: {b=D} out: {b=D}
r(1) -> <v0>
r(2) -> <v1>
mark(1 < 2)
call(1 < 2, compareTo|<v0>, <v1>) -> <v2>
jf(L2|<v2>)
3 mark({ use(b) }) USE: in: {b=READ} out: {b=READ}
r(b) -> <v3> USE: in: {} out: {b=READ}
3 mark({ use(b) }) USE: in: {b=READ} out: {b=READ}
r(b) -> <v3> USE: in: {} out: {b=READ}
mark(use(b))
call(use(b), use|<v3>) -> <v4>
2 jmp(L3) USE: in: {} out: {}
2 jmp(L3) USE: in: {} out: {}
L2:
3 mark({ b = true })
r(true) -> <v5> USE: in: {b=ONLY_WRITTEN_NEVER_READ} out: {b=ONLY_WRITTEN_NEVER_READ}
w(b|<v5>) INIT: in: {b=D} out: {b=ID} USE: in: {} out: {b=ONLY_WRITTEN_NEVER_READ}
L1:
r(true) -> <v5> USE: in: {b=ONLY_WRITTEN_NEVER_READ} out: {b=ONLY_WRITTEN_NEVER_READ}
w(b|<v5>) INIT: in: {b=D} out: {b=ID} USE: in: {} out: {b=ONLY_WRITTEN_NEVER_READ}
L3:
1 <END> INIT: in: {} out: {}
2 merge(if (1 < 2) { use(b) } else { b = true }|<v4>, !<v6>) -> <v7> INIT: in: {b=D} out: {b=D}
L1:
1 <END> INIT: in: {} out: {}
error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
<SINK> USE: in: {} out: {}
=====================
== use ==
fun use(vararg a: Any?) = a
compiler/testData/cfg-variables/basic/IfWithUninitialized.values
+11 -9
View File
@@ -9,15 +9,17 @@ fun foo() {
}
}
---------------------
1 <v0>: {<: Comparable<Int>} NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1 < 2 <v2>: Boolean NEW: call(1 < 2, compareTo|<v0>, <v1>) -> <v2>
b <v3>: * NEW: r(b) -> <v3>
use(b) <v4>: * NEW: call(use(b), use|<v3>) -> <v4>
{ use(b) } <v4>: * COPY
true <v5>: Boolean NEW: r(true) -> <v5>
if (1 < 2) { use(b) } else { b = true } <v4>: * COPY
{ val b: Boolean if (1 < 2) { use(b) } else { b = true } } <v4>: * COPY
1 <v0>: {<: Comparable<Int>} NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1 < 2 <v2>: Boolean NEW: call(1 < 2, compareTo|<v0>, <v1>) -> <v2>
b <v3>: * NEW: r(b) -> <v3>
use(b) <v4>: * NEW: call(use(b), use|<v3>) -> <v4>
{ use(b) } <v4>: * COPY
true <v5>: Boolean NEW: r(true) -> <v5>
b = true !<v6>: *
{ b = true } !<v6>: * COPY
if (1 < 2) { use(b) } else { b = true } <v7>: * NEW: merge(if (1 < 2) { use(b) } else { b = true }|<v4>, !<v6>) -> <v7>
{ val b: Boolean if (1 < 2) { use(b) } else { b = true } } <v7>: * COPY
=====================
== use ==
fun use(vararg a: Any?) = a
compiler/testData/cfg-variables/basic/InitializedNotDeclared.values
+4 -2
View File
@@ -6,6 +6,8 @@ class A {
val x: Int
}
---------------------
<v0>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
<v0>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
x = 1 !<v2>: *
{ x = 1 } !<v2>: * COPY
=====================
compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values
+1 -1
View File
@@ -20,7 +20,7 @@ fun foo() {
x <v1>: Int NEW: r(x) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
x + a <v3>: Int NEW: call(x + a, plus|<v1>, <v2>) -> <v3>
a <v4>: * NEW: r(a) -> <v4>
a <v4>: * NEW: r(a) -> <v4>
use(a) <v5>: {<: Array<Any?>} NEW: call(use(a), use|<v4>) -> <v5>
val y = x + a use(a) <v5>: {<: Array<Any?>} COPY
=====================
compiler/testData/cfg-variables/basic/VariablesUsage.values
+3 -1
View File
@@ -20,7 +20,9 @@ fun bar() {
b = 3
}
---------------------
3 <v0>: Int NEW: r(3) -> <v0>
3 <v0>: Int NEW: r(3) -> <v0>
b = 3 !<v1>: *
{ val b: Int b = 3 } !<v1>: * COPY
=====================
== use ==
fun use(a: Int) = a
compiler/testData/cfg-variables/bugs/varInitializationInIf.instructions
+6 -5
View File
@@ -26,14 +26,15 @@ L0:
2 jmp(L3) INIT: in: {b=ID} out: {b=ID} USE: in: {b=READ} out: {b=READ}
L2:
3 mark({ b = true }) INIT: in: {b=D} out: {b=D}
r(true) -> <v4> USE: in: {b=WRITTEN_AFTER_READ} out: {b=WRITTEN_AFTER_READ}
w(b|<v4>) INIT: in: {b=D} out: {b=ID} USE: in: {b=READ} out: {b=WRITTEN_AFTER_READ}
r(true) -> <v5> USE: in: {b=WRITTEN_AFTER_READ} out: {b=WRITTEN_AFTER_READ}
w(b|<v5>) INIT: in: {b=D} out: {b=ID} USE: in: {b=READ} out: {b=WRITTEN_AFTER_READ}
L3:
2 error(use(b), No resolved call) INIT: in: {b=ID} out: {b=ID} USE: in: {b=READ} out: {b=READ}
r(b) -> <v5> USE: in: {} out: {b=READ}
2 merge(if (1 < 2) { b = false } else { b = true }|!<v4>, !<v6>) -> <v7> INIT: in: {b=ID} out: {b=ID}
error(use(b), No resolved call) USE: in: {b=READ} out: {b=READ}
r(b) -> <v8> USE: in: {} out: {b=READ}
error(use, No resolved call)
mark(use(b))
magic[UNRESOLVED_CALL](use(b)|<v5>) -> <v6>
magic[UNRESOLVED_CALL](use(b)|<v8>, !<v9>) -> <v10>
L1:
1 <END> INIT: in: {} out: {}
error:
compiler/testData/cfg-variables/bugs/varInitializationInIf.values
+14 -8
View File
@@ -10,12 +10,18 @@ fun foo() {
use(b)
}
---------------------
1 <v0>: {<: Comparable<Int>} NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1 < 2 <v2>: Boolean NEW: call(1 < 2, compareTo|<v0>, <v1>) -> <v2>
false <v3>: Boolean NEW: r(false) -> <v3>
true <v4>: Boolean NEW: r(true) -> <v4>
b <v5>: * NEW: r(b) -> <v5>
use(b) <v6>: * NEW: magic[UNRESOLVED_CALL](use(b)|<v5>) -> <v6>
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v6>: * COPY
1 <v0>: {<: Comparable<Int>} NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1 < 2 <v2>: Boolean NEW: call(1 < 2, compareTo|<v0>, <v1>) -> <v2>
false <v3>: Boolean NEW: r(false) -> <v3>
b = false !<v4>: *
{ b = false } !<v4>: * COPY
true <v5>: Boolean NEW: r(true) -> <v5>
b = true !<v6>: *
{ b = true } !<v6>: * COPY
if (1 < 2) { b = false } else { b = true } <v7>: * NEW: merge(if (1 < 2) { b = false } else { b = true }|!<v4>, !<v6>) -> <v7>
use !<v9>: *
b <v8>: * NEW: r(b) -> <v8>
use(b) <v10>: * NEW: magic[UNRESOLVED_CALL](use(b)|<v8>, !<v9>) -> <v10>
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v10>: * COPY
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.instructions
+5 -4
View File
@@ -42,12 +42,13 @@ L5 [body entry point]:
4 jmp(L7) INIT: in: {b=ID, i=ID, numbers=ID} out: {b=ID, i=ID, numbers=ID} USE: in: {b=READ} out: {b=READ}
L6:
5 mark({ b = true }) INIT: in: {b=D, i=ID, numbers=ID} out: {b=D, i=ID, numbers=ID}
r(true) -> <v7> USE: in: {b=WRITTEN_AFTER_READ} out: {b=WRITTEN_AFTER_READ}
w(b|<v7>) INIT: in: {b=D, i=ID, numbers=ID} out: {b=ID, i=ID, numbers=ID} USE: in: {b=READ} out: {b=WRITTEN_AFTER_READ}
r(true) -> <v8> USE: in: {b=WRITTEN_AFTER_READ} out: {b=WRITTEN_AFTER_READ}
w(b|<v8>) INIT: in: {b=D, i=ID, numbers=ID} out: {b=ID, i=ID, numbers=ID} USE: in: {b=READ} out: {b=WRITTEN_AFTER_READ}
L7:
4 r(b) -> <v8> INIT: in: {b=ID, i=ID, numbers=ID} out: {b=ID, i=ID, numbers=ID} USE: in: {} out: {b=READ}
4 merge(if (1 < 2) { b = false } else { b = true }|!<v7>, !<v9>) -> <v10> INIT: in: {b=ID, i=ID, numbers=ID} out: {b=ID, i=ID, numbers=ID} USE: in: {b=READ} out: {b=READ}
r(b) -> <v11> USE: in: {} out: {b=READ}
mark(use(b))
call(use(b), use|<v8>) -> <v9>
call(use(b), use|<v11>) -> <v12>
jmp(L4 [loop entry point]) USE: in: {} out: {}
- 3 jmp?(L4 [loop entry point])
L2:
compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values
+19 -10
View File
@@ -13,16 +13,25 @@ fun foo(numbers: Collection<Int>) {
}
}
---------------------
<v0>: {<: Collection<Int>} NEW: magic[FAKE_INITIALIZER](numbers: Collection<Int>) -> <v0>
<v2>: Int NEW: magic[LOOP_RANGE_ITERATION](numbers|<v1>) -> <v2>
numbers <v1>: {<: Iterable<Int>} NEW: r(numbers) -> <v1>
1 <v3>: {<: Comparable<Int>} NEW: r(1) -> <v3>
2 <v4>: Int NEW: r(2) -> <v4>
1 < 2 <v5>: Boolean NEW: call(1 < 2, compareTo|<v3>, <v4>) -> <v5>
false <v6>: Boolean NEW: r(false) -> <v6>
true <v7>: Boolean NEW: r(true) -> <v7>
b <v8>: * NEW: r(b) -> <v8>
use(b) <v9>: * NEW: call(use(b), use|<v8>) -> <v9>
<v0>: {<: Collection<Int>} NEW: magic[FAKE_INITIALIZER](numbers: Collection<Int>) -> <v0>
<v2>: Int NEW: magic[LOOP_RANGE_ITERATION](numbers|<v1>) -> <v2>
numbers <v1>: {<: Iterable<Int>} NEW: r(numbers) -> <v1>
1 <v3>: {<: Comparable<Int>} NEW: r(1) -> <v3>
2 <v4>: Int NEW: r(2) -> <v4>
1 < 2 <v5>: Boolean NEW: call(1 < 2, compareTo|<v3>, <v4>) -> <v5>
false <v6>: Boolean NEW: r(false) -> <v6>
b = false !<v7>: *
{ b = false } !<v7>: * COPY
true <v8>: Boolean NEW: r(true) -> <v8>
b = true !<v9>: *
{ b = true } !<v9>: * COPY
if (1 < 2) { b = false } else { b = true } <v10>: * NEW: merge(if (1 < 2) { b = false } else { b = true }|!<v7>, !<v9>) -> <v10>
b <v11>: * NEW: r(b) -> <v11>
use(b) <v12>: * NEW: call(use(b), use|<v11>) -> <v12>
continue !<v13>: *
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) continue } !<v13>: * COPY
for (i in numbers) { val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) continue } !<v14>: *
{ for (i in numbers) { val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) continue } } !<v14>: * COPY
=====================
== use ==
fun use(vararg a: Any?) = a
compiler/testData/cfg-variables/lexicalScopes/doWhileScope.values
+7 -7
View File
@@ -7,11 +7,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
a <v2>: {<: Comparable<Int>} NEW: r(a) -> <v2>
0 <v3>: Int NEW: r(0) -> <v3>
"before" <v0>: * NEW: r("before") -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
a <v2>: {<: Comparable<Int>} NEW: r(a) -> <v2>
0 <v3>: Int NEW: r(0) -> <v3>
a > 0 <v4>: Boolean NEW: call(a > 0, compareTo|<v2>, <v3>) -> <v4>
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" do { var a = 2 } while (a > 0) "after" } <v5>: * COPY
=====================
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" do { var a = 2 } while (a > 0) "after" } <v5>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/forScope.values
+7 -7
View File
@@ -8,11 +8,11 @@ fun foo() {
}
---------------------
<v4>: Int NEW: magic[LOOP_RANGE_ITERATION](1..10|<v3>) -> <v4>
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
10 <v2>: Int NEW: r(10) -> <v2>
1..10 <v3>: {<: Iterable<Int>} NEW: call(1..10, rangeTo|<v1>, <v2>) -> <v3>
i <v5>: Int NEW: r(i) -> <v5>
"after" <v6>: * NEW: r("after") -> <v6>
{ "before" for (i in 1..10) { val a = i } "after" } <v6>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
10 <v2>: Int NEW: r(10) -> <v2>
1..10 <v3>: {<: Iterable<Int>} NEW: call(1..10, rangeTo|<v1>, <v2>) -> <v3>
i <v5>: Int NEW: r(i) -> <v5>
"after" <v6>: * NEW: r("after") -> <v6>
{ "before" for (i in 1..10) { val a = i } "after" } <v6>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.values
+7 -7
View File
@@ -8,11 +8,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
{ (x: Int) -> val a = x + b } <v2>: {<: (Int) -> Unit} NEW: r({ (x: Int) -> val a = x + b }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val b = 1 val f = { (x: Int) -> val a = x + b } "after" } <v3>: * COPY
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val b = 1 val f = { (x: Int) -> val a = x + b } "after" } <v3>: * COPY
=====================
== anonymous_0 ==
{ (x: Int) ->
@@ -20,7 +20,7 @@ fun foo() {
}
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(x + b, plus|<v1>, <v2>) -> <v3>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(x + b, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/lexicalScopes/ifScope.instructions
+12 -11
View File
@@ -11,7 +11,7 @@ fun foo() {
}
---------------------
L0:
1 <START> INIT: in: {} out: {}
1 <START> INIT: in: {} out: {}
2 mark({ "before" if (true) { val a = 1 } else { val b = 2 } "after" })
mark("before")
r("before") -> <v0>
@@ -19,22 +19,23 @@ L0:
r(true) -> <v1>
jf(L2|<v1>)
3 mark({ val a = 1 })
v(val a = 1) INIT: in: {} out: {a=D}
r(1) -> <v2> INIT: in: {a=D} out: {a=D}
w(a|<v2>) INIT: in: {a=D} out: {a=ID}
2 jmp(L3) INIT: in: {} out: {}
v(val a = 1) INIT: in: {} out: {a=D}
r(1) -> <v2> INIT: in: {a=D} out: {a=D}
w(a|<v2>) INIT: in: {a=D} out: {a=ID}
2 jmp(L3) INIT: in: {} out: {}
L2:
3 mark({ val b = 2 })
v(val b = 2) INIT: in: {} out: {b=D}
r(2) -> <v3> INIT: in: {b=D} out: {b=D}
w(b|<v3>) INIT: in: {b=D} out: {b=ID}
v(val b = 2) INIT: in: {} out: {b=D}
r(2) -> <v3> INIT: in: {b=D} out: {b=D}
w(b|<v3>) INIT: in: {b=D} out: {b=ID}
L3:
2 mark("after") INIT: in: {} out: {}
r("after") -> <v4>
2 merge(if (true) { val a = 1 } else { val b = 2 }|!<v4>, !<v5>) -> <v6> INIT: in: {} out: {}
mark("after")
r("after") -> <v7>
L1:
1 <END>
error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
<SINK> USE: in: {} out: {}
=====================
compiler/testData/cfg-variables/lexicalScopes/ifScope.values
+10 -7
View File
@@ -10,10 +10,13 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
true <v1>: Boolean NEW: r(true) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
2 <v3>: Int NEW: r(2) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" if (true) { val a = 1 } else { val b = 2 } "after" } <v4>: * COPY
=====================
"before" <v0>: * NEW: r("before") -> <v0>
true <v1>: Boolean NEW: r(true) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
{ val a = 1 } !<v4>: *
2 <v3>: Int NEW: r(2) -> <v3>
{ val b = 2 } !<v5>: *
if (true) { val a = 1 } else { val b = 2 } <v6>: * NEW: merge(if (true) { val a = 1 } else { val b = 2 }|!<v4>, !<v5>) -> <v6>
"after" <v7>: * NEW: r("after") -> <v7>
{ "before" if (true) { val a = 1 } else { val b = 2 } "after" } <v7>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/localClass.values
+6 -6
View File
@@ -13,11 +13,11 @@ fun foo() {
}
---------------------
<v1>: Int NEW: magic[FAKE_INITIALIZER](val x: Int) -> <v1>
<v2>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
x <v3>: Int NEW: r(x|<v2>) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
<v2>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
x <v3>: Int NEW: r(x|<v2>) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
=====================
== foo ==
fun foo() {
@@ -25,5 +25,5 @@ fun foo() {
}
---------------------
<v0>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
x <v1>: Int NEW: r(x|<v0>) -> <v1>
x <v1>: Int NEW: r(x|<v0>) -> <v1>
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.values
+6 -6
View File
@@ -9,9 +9,9 @@ fun foo() {
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" val b = 1 fun local(x: Int) { val a = x + b } "after" } <v2>: * COPY
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" val b = 1 fun local(x: Int) { val a = x + b } "after" } <v2>: * COPY
=====================
== local ==
fun local(x: Int) {
@@ -19,7 +19,7 @@ fun local(x: Int) {
}
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(x + b, plus|<v1>, <v2>) -> <v3>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(x + b, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/lexicalScopes/localObject.values
+4 -4
View File
@@ -13,9 +13,9 @@ fun foo() {
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
=====================
== foo ==
fun foo() {
@@ -23,4 +23,4 @@ fun foo() {
}
---------------------
2 <v0>: Int NEW: r(2) -> <v0>
=====================
=====================
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.values
+5 -5
View File
@@ -12,11 +12,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW: r(object { { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
=====================
== foo ==
fun foo() {
@@ -24,4 +24,4 @@ fun foo() {
}
---------------------
2 <v0>: Int NEW: r(2) -> <v0>
=====================
=====================
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.values
+9 -5
View File
@@ -17,15 +17,19 @@ get() {
return $a
}
---------------------
<v0>: A NEW: magic[IMPLICIT_RECEIVER]($a) -> <v0>
$a <v1>: Int NEW: r($a|<v0>) -> <v1>
<v0>: A NEW: magic[IMPLICIT_RECEIVER]($a) -> <v0>
$a <v1>: Int NEW: r($a|<v0>) -> <v1>
return $a !<v2>: *
{ return $a } !<v2>: * COPY
=====================
== set_a ==
set(v: Int) {
$a = v
}
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](v: Int) -> <v0>
<v1>: A NEW: magic[IMPLICIT_RECEIVER]($a) -> <v1>
v <v2>: Int NEW: r(v) -> <v2>
<v0>: Int NEW: magic[FAKE_INITIALIZER](v: Int) -> <v0>
<v1>: A NEW: magic[IMPLICIT_RECEIVER]($a) -> <v1>
v <v2>: Int NEW: r(v) -> <v2>
$a = v !<v3>: *
{ $a = v } !<v3>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/tryScope.instructions
+3 -2
View File
@@ -49,8 +49,9 @@ L5 [skipFinallyToErrorBlock]:
v(val a = 1) INIT: in: {} out: {a=D}
r(1) -> <v4> INIT: in: {a=D} out: {a=D}
w(a|<v4>) INIT: in: {a=D} out: {a=ID}
2 mark("after") INIT: in: {} out: {}
r("after") -> <v5>
2 merge(try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 }|<v1>, !<v5>) -> <v6> INIT: in: {} out: {}
mark("after")
r("after") -> <v7>
L1:
1 <END>
error:
compiler/testData/cfg-variables/lexicalScopes/tryScope.values
+10 -9
View File
@@ -13,13 +13,14 @@ fun foo() {
"after"
}
---------------------
<v2>: {<: Exception} NEW: magic[FAKE_INITIALIZER](e: Exception) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
foo() <v1>: * NEW: call(foo(), foo) -> <v1>
{ foo() } <v1>: * COPY
e <v3>: {<: Exception} NEW: r(e) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v1>: * COPY
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } "after" } <v5>: * COPY
<v2>: {<: Exception} NEW: magic[FAKE_INITIALIZER](e: Exception) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
foo() <v1>: * NEW: call(foo(), foo) -> <v1>
{ foo() } <v1>: * COPY
e <v3>: {<: Exception} NEW: r(e) -> <v3>
{ val a = e } !<v5>: *
1 <v4>: Int NEW: r(1) -> <v4>
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v6>: * NEW: merge(try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 }|<v1>, !<v5>) -> <v6>
"after" <v7>: * NEW: r("after") -> <v7>
{ "before" try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } "after" } <v7>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/whileScope.instructions
+2 -2
View File
@@ -22,9 +22,9 @@ L4 [body entry point]:
v(val a: Int) INIT: in: {} out: {a=D}
2 jmp(L2 [loop entry point]) INIT: in: {} out: {} USE: in: {} out: {}
L3 [loop exit point]:
- read (Unit) -> <v3>
- read (Unit)
- mark("after")
- r("after") -> <v4>
- r("after") -> <v3>
L1:
1 <END> INIT: in: {} out: {}
error:
compiler/testData/cfg-variables/lexicalScopes/whileScope.values
+2 -2
View File
@@ -10,6 +10,6 @@ fun foo() {
<v2>: * NEW: magic[VALUE_CONSUMER](true|<v1>) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
true <v1>: Boolean NEW: r(true) -> <v1>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" while (true) { val a: Int } "after" } <v3>: * COPY
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" while (true) { val a: Int } "after" } <v3>: * COPY
=====================