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/basic/Basic.instructions
+14 -14
View File
@@ -20,7 +20,7 @@ fun f(a : Boolean) : Unit {
L0:
1 <START>
v(a : Boolean)
magic(a : Boolean) -> <v0>
magic[FAKE_INITIALIZER](a : Boolean) -> <v0>
w(a|<v0>)
2 mark({ 1 a 2.toLong() foo(a, 3) genfun<Any>() flfun {1} 3.equals(4) 3 equals 4 1 + 2 a && true a || false })
r(1) -> <v1>
@@ -56,15 +56,15 @@ L2:
mark(1 + 2)
call(1 + 2, plus|<v17>, <v18>) -> <v19>
r(a) -> <v20>
jf(L5|<v20>) NEXT:[magic(a && true|<v20>, <v21>) -> <v22>, r(true) -> <v21>]
jf(L5|<v20>) NEXT:[magic[AND](a && true|<v20>, <v21>) -> <v22>, r(true) -> <v21>]
r(true) -> <v21>
L5:
magic(a && true|<v20>, <v21>) -> <v22> PREV:[jf(L5|<v20>), r(true) -> <v21>]
magic[AND](a && true|<v20>, <v21>) -> <v22> PREV:[jf(L5|<v20>), r(true) -> <v21>]
r(a) -> <v23>
jt(L6|<v23>) NEXT:[r(false) -> <v24>, magic(a || false|<v23>, <v24>) -> <v25>]
jt(L6|<v23>) NEXT:[r(false) -> <v24>, magic[OR](a || false|<v23>, <v24>) -> <v25>]
r(false) -> <v24>
L6:
magic(a || false|<v23>, <v24>) -> <v25> PREV:[jt(L6|<v23>), r(false) -> <v24>]
magic[OR](a || false|<v23>, <v24>) -> <v25> PREV:[jt(L6|<v23>), r(false) -> <v24>]
L1:
1 <END> NEXT:[<SINK>]
error:
@@ -93,19 +93,19 @@ fun foo(a : Boolean, b : Int) : Unit {}
L0:
1 <START>
v(a : Boolean)
magic(a : Boolean) -> <v0>
magic[FAKE_INITIALIZER](a : Boolean) -> <v0>
w(a|<v0>)
v(b : Int)
magic(b : Int) -> <v1>
magic[FAKE_INITIALIZER](b : Int) -> <v1>
w(b|<v1>)
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>]
=====================
== genfun ==
fun genfun<T>() : Unit {}
@@ -127,14 +127,14 @@ fun flfun(f : () -> Any) : Unit {}
L0:
1 <START>
v(f : () -> Any)
magic(f : () -> Any) -> <v0>
magic[FAKE_INITIALIZER](f : () -> Any) -> <v0>
w(f|<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>]
=====================
compiler/testData/cfg/basic/Basic.values
+32 -32
View File
@@ -17,47 +17,47 @@ fun f(a : Boolean) : Unit {
}
---------------------
<v0>: Boolean NEW: magic(a : Boolean) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
a <v2>: * NEW: r(a) -> <v2>
2 <v3>: {<: Number} NEW: r(2) -> <v3>
toLong() <v4>: * NEW: call(toLong(), toLong|<v3>) -> <v4>
2.toLong() <v4>: * COPY
a <v5>: Boolean NEW: r(a) -> <v5>
3 <v6>: Int NEW: r(3) -> <v6>
foo(a, 3) <v7>: * NEW: call(foo(a, 3), foo|<v5>, <v6>) -> <v7>
genfun<Any>() <v8>: * NEW: call(genfun<Any>(), genfun) -> <v8>
{1} <v9>: {<: () -> Any} NEW: r({1}) -> <v9>
flfun {1} <v10>: * NEW: call(flfun {1}, flfun|<v9>) -> <v10>
3 <v11>: OR{{<: Any}, {<: Any}} NEW: r(3) -> <v11>
4 <v12>: {<: Any?} NEW: r(4) -> <v12>
equals(4) <v13>: * NEW: call(equals(4), equals|<v11>, <v12>) -> <v13>
3.equals(4) <v13>: * COPY
3 <v14>: OR{{<: Any}, {<: Any}} NEW: r(3) -> <v14>
4 <v15>: {<: Any?} NEW: r(4) -> <v15>
<v0>: Boolean NEW: magic[FAKE_INITIALIZER](a : Boolean) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
a <v2>: * NEW: r(a) -> <v2>
2 <v3>: {<: Number} NEW: r(2) -> <v3>
toLong() <v4>: * NEW: call(toLong(), toLong|<v3>) -> <v4>
2.toLong() <v4>: * COPY
a <v5>: Boolean NEW: r(a) -> <v5>
3 <v6>: Int NEW: r(3) -> <v6>
foo(a, 3) <v7>: * NEW: call(foo(a, 3), foo|<v5>, <v6>) -> <v7>
genfun<Any>() <v8>: * NEW: call(genfun<Any>(), genfun) -> <v8>
{1} <v9>: {<: () -> Any} NEW: r({1}) -> <v9>
flfun {1} <v10>: * NEW: call(flfun {1}, flfun|<v9>) -> <v10>
3 <v11>: OR{{<: Any}, {<: Any}} NEW: r(3) -> <v11>
4 <v12>: {<: Any?} NEW: r(4) -> <v12>
equals(4) <v13>: * NEW: call(equals(4), equals|<v11>, <v12>) -> <v13>
3.equals(4) <v13>: * COPY
3 <v14>: OR{{<: Any}, {<: Any}} NEW: r(3) -> <v14>
4 <v15>: {<: Any?} NEW: r(4) -> <v15>
3 equals 4 <v16>: * NEW: call(3 equals 4, equals|<v14>, <v15>) -> <v16>
1 <v17>: Int NEW: r(1) -> <v17>
2 <v18>: Int NEW: r(2) -> <v18>
1 + 2 <v19>: * NEW: call(1 + 2, plus|<v17>, <v18>) -> <v19>
a <v20>: Boolean NEW: r(a) -> <v20>
true <v21>: Boolean NEW: r(true) -> <v21>
a && true <v22>: * NEW: magic(a && true|<v20>, <v21>) -> <v22>
a <v23>: Boolean NEW: r(a) -> <v23>
false <v24>: Boolean NEW: r(false) -> <v24>
a || false <v25>: * NEW: magic(a || false|<v23>, <v24>) -> <v25>
{ 1 a 2.toLong() foo(a, 3) genfun<Any>() flfun {1} 3.equals(4) 3 equals 4 1 + 2 a && true a || false } <v25>: * COPY
1 <v17>: Int NEW: r(1) -> <v17>
2 <v18>: Int NEW: r(2) -> <v18>
1 + 2 <v19>: * NEW: call(1 + 2, plus|<v17>, <v18>) -> <v19>
a <v20>: Boolean NEW: r(a) -> <v20>
true <v21>: Boolean NEW: r(true) -> <v21>
a && true <v22>: * NEW: magic[AND](a && true|<v20>, <v21>) -> <v22>
a <v23>: Boolean NEW: r(a) -> <v23>
false <v24>: Boolean NEW: r(false) -> <v24>
a || false <v25>: * NEW: magic[OR](a || false|<v23>, <v24>) -> <v25>
{ 1 a 2.toLong() foo(a, 3) genfun<Any>() flfun {1} 3.equals(4) 3 equals 4 1 + 2 a && true a || false } <v25>: * COPY
=====================
== anonymous_0 ==
{1}
---------------------
1 <v0>: Int NEW: r(1) -> <v0>
1 <v0>: Int COPY
1 <v0>: Int COPY
=====================
== foo ==
fun foo(a : Boolean, b : Int) : Unit {}
---------------------
<v0>: Boolean NEW: magic(a : Boolean) -> <v0>
<v1>: Int NEW: magic(b : Int) -> <v1>
<v0>: Boolean NEW: magic[FAKE_INITIALIZER](a : Boolean) -> <v0>
<v1>: Int NEW: magic[FAKE_INITIALIZER](b : Int) -> <v1>
=====================
== genfun ==
fun genfun<T>() : Unit {}
@@ -66,5 +66,5 @@ fun genfun<T>() : Unit {}
== flfun ==
fun flfun(f : () -> Any) : Unit {}
---------------------
<v0>: {<: () -> Any} NEW: magic(f : () -> Any) -> <v0>
<v0>: {<: () -> Any} NEW: magic[FAKE_INITIALIZER](f : () -> Any) -> <v0>
=====================