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

Pseudocode: Add debug information to magic instructions

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-26 13:06:28 +04:00
parent d636d362b7
commit 4707f4a5e9
125 changed files with 1204 additions and 1157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/declarations/local/LocalDeclarations.instructions
+27 -27
View File
@@ -35,16 +35,16 @@ fun doSmth(i: Int) {}
L0:
1 <START>
v(i: Int)
magic(i: Int) -> <v0>
magic[FAKE_INITIALIZER](i: Int) -> <v0>
w(i|<v0>)
2 mark({})
read (Unit)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== test1 ==
fun test1() {
@@ -63,7 +63,7 @@ L0:
mark(object { val x : Int { $x = 1 } })
v(val x : Int)
3 mark({ $x = 1 })
magic($x) -> <v0>
magic[IMPLICIT_RECEIVER]($x) -> <v0>
r(1) -> <v1>
w($x|<v0>, <v1>)
2 r(object { val x : Int { $x = 1 } }) -> <v2>
@@ -87,15 +87,15 @@ L0:
1 <START>
v(val x : Int)
2 mark({ $x = 1 })
magic($x) -> <v0>
magic[IMPLICIT_RECEIVER]($x) -> <v0>
r(1) -> <v1>
w($x|<v0>, <v1>)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== test2 ==
fun test2() {
@@ -161,15 +161,15 @@ fun inner_bar() {
L3:
3 <START>
4 mark({ y = 10 })
magic(y) -> <v0>
magic[IMPLICIT_RECEIVER](y) -> <v0>
r(10) -> <v1>
w(y|<v0>, <v1>)
L4:
3 <END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== test4 ==
fun test4() {
@@ -193,7 +193,7 @@ L0:
v(val x : Int)
v(val y : Int)
3 mark({ $x = 1 })
magic($x) -> <v0>
magic[IMPLICIT_RECEIVER]($x) -> <v0>
r(1) -> <v1>
w($x|<v0>, <v1>)
2 jmp?(L2) NEXT:[r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v2>, d(fun ggg() { y = 10 })]
@@ -216,15 +216,15 @@ fun ggg() {
L3:
3 <START>
4 mark({ y = 10 })
magic(y) -> <v0>
magic[IMPLICIT_RECEIVER](y) -> <v0>
r(10) -> <v1>
w(y|<v0>, <v1>)
L4:
3 <END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== test5 ==
fun test5() {
@@ -251,7 +251,7 @@ L0:
r(1) -> <v0>
w(x|<v0>)
3 mark({ $x = 2 })
magic($x) -> <v1>
magic[IMPLICIT_RECEIVER]($x) -> <v1>
r(2) -> <v2>
w($x|<v1>, <v2>)
2 jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })]
@@ -277,15 +277,15 @@ fun foo() {
L3:
3 <START>
4 mark({ x = 3 })
magic(x) -> <v0>
magic[IMPLICIT_RECEIVER](x) -> <v0>
r(3) -> <v1>
w(x|<v0>, <v1>)
L4:
3 <END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== bar ==
fun bar() {
@@ -295,13 +295,13 @@ fun bar() {
L6:
3 <START>
4 mark({ x = 4 })
magic(x) -> <v0>
magic[IMPLICIT_RECEIVER](x) -> <v0>
r(4) -> <v1>
w(x|<v0>, <v1>)
L7:
3 <END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/declarations/local/LocalDeclarations.values
+14 -14
View File
@@ -22,7 +22,7 @@ class C() {
== doSmth ==
fun doSmth(i: Int) {}
---------------------
<v0>: Int NEW: magic(i: Int) -> <v0>
<v0>: Int NEW: magic[FAKE_INITIALIZER](i: Int) -> <v0>
=====================
== test1 ==
fun test1() {
@@ -34,7 +34,7 @@ fun test1() {
}
}
---------------------
<v0>: <no name provided> NEW: magic($x) -> <v0>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { val x : Int { $x = 1 } } <v2>: <no name provided> NEW: r(object { val x : Int { $x = 1 } }) -> <v2>
=====================
@@ -46,8 +46,8 @@ object O {
}
}
---------------------
<v0>: O NEW: magic($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
<v0>: O NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
=====================
== test2 ==
fun test2() {
@@ -78,8 +78,8 @@ fun inner_bar() {
y = 10
}
---------------------
<v0>: <no name provided> NEW: magic(y) -> <v0>
10 <v1>: Int NEW: r(10) -> <v1>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER](y) -> <v0>
10 <v1>: Int NEW: r(10) -> <v1>
=====================
== test4 ==
fun test4() {
@@ -95,7 +95,7 @@ fun test4() {
}
}
---------------------
<v0>: <no name provided> NEW: magic($x) -> <v0>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } <v2>: <no name provided> NEW: r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v2>
=====================
@@ -104,8 +104,8 @@ fun ggg() {
y = 10
}
---------------------
<v0>: <no name provided> NEW: magic(y) -> <v0>
10 <v1>: Int NEW: r(10) -> <v1>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER](y) -> <v0>
10 <v1>: Int NEW: r(10) -> <v1>
=====================
== test5 ==
fun test5() {
@@ -123,7 +123,7 @@ fun test5() {
}
}
---------------------
<v1>: <no name provided> NEW: magic($x) -> <v1>
<v1>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v3>: <no name provided> NEW: r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v3>
@@ -133,14 +133,14 @@ fun foo() {
x = 3
}
---------------------
<v0>: <no name provided> NEW: magic(x) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
=====================
== bar ==
fun bar() {
x = 4
}
---------------------
<v0>: <no name provided> NEW: magic(x) -> <v0>
4 <v1>: Int NEW: r(4) -> <v1>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
4 <v1>: Int NEW: r(4) -> <v1>
=====================
compiler/testData/cfg/declarations/local/ObjectExpression.instructions
+2 -2
View File
@@ -62,13 +62,13 @@ fun foo(b: B) : Int {
L0:
1 <START>
v(b: B)
magic(b: B) -> <v0>
magic[FAKE_INITIALIZER](b: B) -> <v0>
w(b|<v0>)
2 mark({ val o = object : A by b {} return o.foo() })
v(val o = object : A by b {})
mark(object : A by b {})
r(b) -> <v1>
magic(A by b|<v1>) -> <v2>
magic[VALUE_CONSUMER](A by b|<v1>) -> <v2>
r(object : A by b {}) -> <v3>
w(o|<v3>)
mark(o.foo())
compiler/testData/cfg/declarations/local/ObjectExpression.values
+7 -7
View File
@@ -25,11 +25,11 @@ fun foo(b: B) : Int {
return o.foo()
}
---------------------
<v0>: B NEW: magic(b: B) -> <v0>
b <v1>: {<: A} NEW: r(b) -> <v1>
A by b <v2>: * NEW: magic(A by b|<v1>) -> <v2>
object : A by b {} <v3>: <no name provided> NEW: r(object : A by b {}) -> <v3>
o <v4>: {<: A} NEW: r(o) -> <v4>
foo() <v5>: Int NEW: call(foo(), foo|<v4>) -> <v5>
o.foo() <v5>: Int COPY
<v0>: B NEW: magic[FAKE_INITIALIZER](b: B) -> <v0>
b <v1>: {<: A} NEW: r(b) -> <v1>
A by b <v2>: * NEW: magic[VALUE_CONSUMER](A by b|<v1>) -> <v2>
object : A by b {} <v3>: <no name provided> NEW: r(object : A by b {}) -> <v3>
o <v4>: {<: A} NEW: r(o) -> <v4>
foo() <v5>: Int NEW: call(foo(), foo|<v4>) -> <v5>
o.foo() <v5>: Int COPY
=====================