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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Andrey Breslav
2011-10-21 21:43:16 +04:00
parent a67b76d105 fe869a236d
commit a1deb4b86a
43 changed files with 1586 additions and 1239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/ArrayAccess.instructions
+23 -23
View File
@@ -10,29 +10,29 @@ fun foo() {
}
---------------------
l0:
<START>
r(Array)
r(Array<Int>)
w(a)
r(3)
r(4)
r(10)
r(a)
r(=)
w(a[10])
r(2)
r(10)
r(a)
r(a[10])
r(100)
r(10)
r(a)
r(a[10])
r(1)
r(+=)
w(a[10])
<START> NEXT:[r(Array)] PREV:[]
r(Array) NEXT:[r(Array<Int>)] PREV:[<START>]
r(Array<Int>) NEXT:[w(a)] PREV:[r(Array)]
w(a) NEXT:[r(3)] PREV:[r(Array<Int>)]
r(3) NEXT:[r(4)] PREV:[w(a)]
r(4) NEXT:[r(10)] PREV:[r(3)]
r(10) NEXT:[r(a)] PREV:[r(4)]
r(a) NEXT:[r(=)] PREV:[r(10)]
r(=) NEXT:[w(a[10])] PREV:[r(a)]
w(a[10]) NEXT:[r(2)] PREV:[r(=)]
r(2) NEXT:[r(10)] PREV:[w(a[10])]
r(10) NEXT:[r(a)] PREV:[r(2)]
r(a) NEXT:[r(a[10])] PREV:[r(10)]
r(a[10]) NEXT:[r(100)] PREV:[r(a)]
r(100) NEXT:[r(10)] PREV:[r(a[10])]
r(10) NEXT:[r(a)] PREV:[r(100)]
r(a) NEXT:[r(a[10])] PREV:[r(10)]
r(a[10]) NEXT:[r(1)] PREV:[r(a)]
r(1) NEXT:[r(+=)] PREV:[r(a[10])]
r(+=) NEXT:[w(a[10])] PREV:[r(1)]
w(a[10]) NEXT:[<END>] PREV:[r(+=)]
l1:
<END>
<END> NEXT:[] PREV:[w(a[10])]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/cfg/Assignments.instructions
+34 -34
View File
@@ -14,44 +14,44 @@ fun assignments() : Unit {
}
---------------------
l0:
<START>
r(1)
w(x)
r(2)
w(x)
r(x)
r(2)
r(+=)
w(x)
r(true)
jf(l2)
r(1)
jmp(l3)
<START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[w(x)] PREV:[<START>]
w(x) NEXT:[r(2)] PREV:[r(1)]
r(2) NEXT:[w(x)] PREV:[w(x)]
w(x) NEXT:[r(x)] PREV:[r(2)]
r(x) NEXT:[r(2)] PREV:[w(x)]
r(2) NEXT:[r(+=)] PREV:[r(x)]
r(+=) NEXT:[w(x)] PREV:[r(2)]
w(x) NEXT:[r(true)] PREV:[r(+=)]
r(true) NEXT:[jf(l2)] PREV:[w(x)]
jf(l2) NEXT:[r(2), r(1)] PREV:[r(true)]
r(1) NEXT:[jmp(l3)] PREV:[jf(l2)]
jmp(l3) NEXT:[w(x)] PREV:[r(1)]
l2:
r(2)
r(2) NEXT:[w(x)] PREV:[jf(l2)]
l3:
w(x)
r(true)
jf(l4)
r(false)
w(x) NEXT:[r(true)] PREV:[jmp(l3), r(2)]
r(true) NEXT:[jf(l4)] PREV:[w(x)]
jf(l4) NEXT:[r(true && false), r(false)] PREV:[r(true)]
r(false) NEXT:[r(true && false)] PREV:[jf(l4)]
l4:
r(true && false)
w(y)
r(false)
jf(l5)
r(true)
r(true && false) NEXT:[w(y)] PREV:[jf(l4), r(false)]
w(y) NEXT:[r(false)] PREV:[r(true && false)]
r(false) NEXT:[jf(l5)] PREV:[w(y)]
jf(l5) NEXT:[r(false && true), r(true)] PREV:[r(false)]
r(true) NEXT:[r(false && true)] PREV:[jf(l5)]
l5:
r(false && true)
w(z)
r(Test)
r(Test())
w(t)
r(1)
r(t)
r(=)
w(t.x)
r(false && true) NEXT:[w(z)] PREV:[jf(l5), r(true)]
w(z) NEXT:[r(Test)] PREV:[r(false && true)]
r(Test) NEXT:[r(Test())] PREV:[w(z)]
r(Test()) NEXT:[w(t)] PREV:[r(Test)]
w(t) NEXT:[r(1)] PREV:[r(Test())]
r(1) NEXT:[r(t)] PREV:[w(t)]
r(t) NEXT:[r(=)] PREV:[r(1)]
r(=) NEXT:[w(t.x)] PREV:[r(t)]
w(t.x) NEXT:[<END>] PREV:[r(=)]
l1:
<END>
<END> NEXT:[] PREV:[w(t.x)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/cfg/Basic.instructions
+58 -58
View File
@@ -2,12 +2,12 @@
{1}
---------------------
l2:
<START>
r(1)
<START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[<END>] PREV:[<START>]
l3:
<END>
<END> NEXT:[] PREV:[r(1)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== f ==
fun f(a : Boolean) : Unit {
@@ -29,86 +29,86 @@ fun f(a : Boolean) : Unit {
}
---------------------
l0:
<START>
r(1)
r(a)
r(2)
r(lng)
r(2.lng)
r(a)
r(3)
r(foo)
r(foo(a, 3))
r(genfun)
r(genfun<Any>())
rf({1})
r(flfun)
r(flfun {1})
r(3)
r(4)
r(equals)
r(equals(4))
r(3.equals(4))
r(3)
r(4)
r(equals)
r(3 equals 4)
r(1)
r(2)
r(+)
r(1 + 2)
r(a)
jf(l4)
r(true)
<START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[r(a)] PREV:[<START>]
r(a) NEXT:[r(2)] PREV:[r(1)]
r(2) NEXT:[r(lng)] PREV:[r(a)]
r(lng) NEXT:[r(2.lng)] PREV:[r(2)]
r(2.lng) NEXT:[r(a)] PREV:[r(lng)]
r(a) NEXT:[r(3)] PREV:[r(2.lng)]
r(3) NEXT:[r(foo)] PREV:[r(a)]
r(foo) NEXT:[r(foo(a, 3))] PREV:[r(3)]
r(foo(a, 3)) NEXT:[r(genfun)] PREV:[r(foo)]
r(genfun) NEXT:[r(genfun<Any>())] PREV:[r(foo(a, 3))]
r(genfun<Any>()) NEXT:[rf({1})] PREV:[r(genfun)]
rf({1}) NEXT:[r(flfun)] PREV:[r(genfun<Any>())]
r(flfun) NEXT:[r(flfun {1})] PREV:[rf({1})]
r(flfun {1}) NEXT:[r(3)] PREV:[r(flfun)]
r(3) NEXT:[r(4)] PREV:[r(flfun {1})]
r(4) NEXT:[r(equals)] PREV:[r(3)]
r(equals) NEXT:[r(equals(4))] PREV:[r(4)]
r(equals(4)) NEXT:[r(3.equals(4))] PREV:[r(equals)]
r(3.equals(4)) NEXT:[r(3)] PREV:[r(equals(4))]
r(3) NEXT:[r(4)] PREV:[r(3.equals(4))]
r(4) NEXT:[r(equals)] PREV:[r(3)]
r(equals) NEXT:[r(3 equals 4)] PREV:[r(4)]
r(3 equals 4) NEXT:[r(1)] PREV:[r(equals)]
r(1) NEXT:[r(2)] PREV:[r(3 equals 4)]
r(2) NEXT:[r(+)] PREV:[r(1)]
r(+) NEXT:[r(1 + 2)] PREV:[r(2)]
r(1 + 2) NEXT:[r(a)] PREV:[r(+)]
r(a) NEXT:[jf(l4)] PREV:[r(1 + 2)]
jf(l4) NEXT:[r(a && true), r(true)] PREV:[r(a)]
r(true) NEXT:[r(a && true)] PREV:[jf(l4)]
l4:
r(a && true)
r(a)
jt(l5)
r(false)
r(a && true) NEXT:[r(a)] PREV:[jf(l4), r(true)]
r(a) NEXT:[jt(l5)] PREV:[r(a && true)]
jt(l5) NEXT:[r(false), r(a || false)] PREV:[r(a)]
r(false) NEXT:[r(a || false)] PREV:[jt(l5)]
l5:
r(a || false)
r(a || false) NEXT:[<END>] PREV:[jt(l5), r(false)]
l1:
<END>
<END> NEXT:[] PREV:[r(a || false)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
l2:
<START>
r(1)
<START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[<END>] PREV:[<START>]
l3:
<END>
<END> NEXT:[] PREV:[r(1)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== foo ==
fun foo(a : Boolean, b : Int) : Unit {}
---------------------
l0:
<START>
read (Unit)
<START> NEXT:[read (Unit)] PREV:[]
read (Unit) NEXT:[<END>] PREV:[<START>]
l1:
<END>
<END> NEXT:[] PREV:[read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== genfun ==
fun genfun<T>() : Unit {}
---------------------
l0:
<START>
read (Unit)
<START> NEXT:[read (Unit)] PREV:[]
read (Unit) NEXT:[<END>] PREV:[<START>]
l1:
<END>
<END> NEXT:[] PREV:[read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== flfun ==
fun flfun(f : fun () : Any) : Unit {}
---------------------
l0:
<START>
read (Unit)
<START> NEXT:[read (Unit)] PREV:[]
read (Unit) NEXT:[<END>] PREV:[<START>]
l1:
<END>
<END> NEXT:[] PREV:[read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/cfg/EmptyFunction.instructions
+4 -4
View File
@@ -2,10 +2,10 @@
fun empty() {}
---------------------
l0:
<START>
read (Unit)
<START> NEXT:[read (Unit)] PREV:[]
read (Unit) NEXT:[<END>] PREV:[<START>]
l1:
<END>
<END> NEXT:[] PREV:[read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/cfg/FailFunction.instructions
+10 -10
View File
@@ -4,16 +4,16 @@ fun fail() : Nothing {
}
---------------------
l0:
<START>
r(java)
r(lang)
r(java.lang)
r(RuntimeException)
r(RuntimeException())
r(java.lang.RuntimeException())
jmp(error)
<START> NEXT:[r(java)] PREV:[]
r(java) NEXT:[r(lang)] PREV:[<START>]
r(lang) NEXT:[r(java.lang)] PREV:[r(java)]
r(java.lang) NEXT:[r(RuntimeException)] PREV:[r(lang)]
r(RuntimeException) NEXT:[r(RuntimeException())] PREV:[r(java.lang)]
r(RuntimeException()) NEXT:[r(java.lang.RuntimeException())] PREV:[r(RuntimeException)]
r(java.lang.RuntimeException()) NEXT:[jmp(error)] PREV:[r(RuntimeException())]
jmp(error) NEXT:[<ERROR>] PREV:[r(java.lang.RuntimeException())]
l1:
<END>
<END> NEXT:[] PREV:[]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[jmp(error)]
=====================
compiler/testData/cfg/Finally.instructions
+231 -228
View File
@@ -8,15 +8,15 @@ fun t3() {
}
---------------------
l0:
<START>
jmp?(l2)
r(1)
<START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[r(2)] PREV:[jmp?(l2)]
l2:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l2), r(1)]
l1:
<END>
<END> NEXT:[] PREV:[r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3() {
@@ -31,26 +31,26 @@ fun t3() {
}
---------------------
l0:
<START>
jmp?(l2)
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l3)
r(2)
ret l1
jmp(l4)
<START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[r(2)] PREV:[jmp?(l2)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l3)] PREV:[r(>)]
jf(l3) NEXT:[read (Unit), r(2)] PREV:[r(2 > 3)]
r(2) NEXT:[ret l1] PREV:[jf(l3)]
ret l1 NEXT:[<END>] PREV:[r(2)]
jmp(l4) NEXT:[r(2)] PREV:[]
l3:
read (Unit)
read (Unit) NEXT:[r(2)] PREV:[jf(l3)]
l2:
l4:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l2), jmp(l4), read (Unit)]
l1:
<END>
<END> NEXT:[] PREV:[ret l1, r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== anonymous_0 ==
{ () =>
@@ -60,21 +60,21 @@ error:
}
---------------------
l3:
<START>
r(2)
r(3)
r(>)
r(2 > 3)
jf(l5)
ret l4
jmp(l6)
<START> NEXT:[r(2)] PREV:[]
r(2) NEXT:[r(3)] PREV:[<START>]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l5)] PREV:[r(>)]
jf(l5) NEXT:[read (Unit), ret l4] PREV:[r(2 > 3)]
ret l4 NEXT:[<END>] PREV:[jf(l5)]
jmp(l6) NEXT:[<END>] PREV:[]
l5:
read (Unit)
read (Unit) NEXT:[<END>] PREV:[jf(l5)]
l4:
l6:
<END>
<END> NEXT:[] PREV:[ret l4, jmp(l6), read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3() {
@@ -91,36 +91,36 @@ fun t3() {
}
---------------------
l0:
<START>
jmp?(l2)
r(1)
rf({ () =>
if (2 > 3) {
return@
}
})
<START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[rf({ () => if (2 > 3) { retu..)] PREV:[jmp?(l2)]
rf({ () =>
if (2 > 3) {
return@
}
}) NEXT:[r(2)] PREV:[r(1)]
l2:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l2), rf({ () => if (2 > 3) { retu..)]
l1:
<END>
<END> NEXT:[] PREV:[r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
l3:
<START>
r(2)
r(3)
r(>)
r(2 > 3)
jf(l5)
ret l4
jmp(l6)
<START> NEXT:[r(2)] PREV:[]
r(2) NEXT:[r(3)] PREV:[<START>]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l5)] PREV:[r(>)]
jf(l5) NEXT:[read (Unit), ret l4] PREV:[r(2 > 3)]
ret l4 NEXT:[<END>] PREV:[jf(l5)]
jmp(l6) NEXT:[<END>] PREV:[]
l5:
read (Unit)
read (Unit) NEXT:[<END>] PREV:[jf(l5)]
l4:
l6:
<END>
<END> NEXT:[] PREV:[ret l4, jmp(l6), read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== anonymous_1 ==
{ () =>
@@ -135,26 +135,26 @@ error:
}
---------------------
l2:
<START>
jmp?(l4)
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l5)
r(2)
ret l3
jmp(l6)
<START> NEXT:[jmp?(l4)] PREV:[]
jmp?(l4) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[r(2)] PREV:[jmp?(l4)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l5)] PREV:[r(>)]
jf(l5) NEXT:[read (Unit), r(2)] PREV:[r(2 > 3)]
r(2) NEXT:[ret l3] PREV:[jf(l5)]
ret l3 NEXT:[<END>] PREV:[r(2)]
jmp(l6) NEXT:[r(2)] PREV:[]
l5:
read (Unit)
read (Unit) NEXT:[r(2)] PREV:[jf(l5)]
l4:
l6:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l4), jmp(l6), read (Unit)]
l3:
<END>
<END> NEXT:[] PREV:[ret l3, r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3() {
@@ -171,42 +171,42 @@ fun t3() {
}
---------------------
l0:
<START>
rf({ () =>
try {
1
if (2 > 3) {
return@
}
} finally {
2
}
})
<START> NEXT:[rf({ () => try { 1 if (2 > 3..)] PREV:[]
rf({ () =>
try {
1
if (2 > 3) {
return@
}
} finally {
2
}
}) NEXT:[<END>] PREV:[<START>]
l1:
<END>
<END> NEXT:[] PREV:[rf({ () => try { 1 if (2 > 3..)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
l2:
<START>
jmp?(l4)
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l5)
r(2)
ret l3
jmp(l6)
<START> NEXT:[jmp?(l4)] PREV:[]
jmp?(l4) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[r(2)] PREV:[jmp?(l4)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l5)] PREV:[r(>)]
jf(l5) NEXT:[read (Unit), r(2)] PREV:[r(2 > 3)]
r(2) NEXT:[ret l3] PREV:[jf(l5)]
ret l3 NEXT:[<END>] PREV:[r(2)]
jmp(l6) NEXT:[r(2)] PREV:[]
l5:
read (Unit)
read (Unit) NEXT:[r(2)] PREV:[jf(l5)]
l4:
l6:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l4), jmp(l6), read (Unit)]
l3:
<END>
<END> NEXT:[] PREV:[ret l3, r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3() {
@@ -223,34 +223,34 @@ fun t3() {
}
---------------------
l0:
<START>
<START> NEXT:[r(true)] PREV:[]
l2:
l5:
r(true)
jf(l3)
r(true) NEXT:[jf(l3)] PREV:[<START>, jmp(l2)]
jf(l3) NEXT:[read (Unit), jmp?(l6)] PREV:[r(true)]
l4:
jmp?(l6)
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l7)
r(2)
jmp(l3)
jmp(l8)
jmp?(l6) NEXT:[r(2), r(1)] PREV:[jf(l3)]
r(1) NEXT:[r(2)] PREV:[jmp?(l6)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l7)] PREV:[r(>)]
jf(l7) NEXT:[read (Unit), r(2)] PREV:[r(2 > 3)]
r(2) NEXT:[jmp(l3)] PREV:[jf(l7)]
jmp(l3) NEXT:[read (Unit)] PREV:[r(2)]
jmp(l8) NEXT:[r(2)] PREV:[]
l7:
read (Unit)
read (Unit) NEXT:[r(2)] PREV:[jf(l7)]
l6:
l8:
r(2)
jmp(l2)
r(2) NEXT:[jmp(l2)] PREV:[jmp?(l6), jmp(l8), read (Unit)]
jmp(l2) NEXT:[r(true)] PREV:[r(2)]
l3:
read (Unit)
read (Unit) NEXT:[<END>] PREV:[jf(l3), jmp(l3)]
l1:
<END>
<END> NEXT:[] PREV:[read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3() {
@@ -268,34 +268,34 @@ fun t3() {
}
---------------------
l0:
<START>
jmp?(l2)
<START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(true)] PREV:[<START>]
l3:
l6:
r(true)
jf(l4)
r(true) NEXT:[jf(l4)] PREV:[jmp?(l2), jmp(l3)]
jf(l4) NEXT:[read (Unit), r(1)] PREV:[r(true)]
l5:
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l7)
jmp(l4)
jmp(l8)
r(1) NEXT:[r(2)] PREV:[jf(l4)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l7)] PREV:[r(>)]
jf(l7) NEXT:[read (Unit), jmp(l4)] PREV:[r(2 > 3)]
jmp(l4) NEXT:[read (Unit)] PREV:[jf(l7)]
jmp(l8) NEXT:[jmp(l3)] PREV:[]
l7:
read (Unit)
read (Unit) NEXT:[jmp(l3)] PREV:[jf(l7)]
l8:
jmp(l3)
jmp(l3) NEXT:[r(true)] PREV:[jmp(l8), read (Unit)]
l4:
read (Unit)
r(5)
read (Unit) NEXT:[r(5)] PREV:[jf(l4), jmp(l4)]
r(5) NEXT:[r(2)] PREV:[read (Unit)]
l2:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l2), r(5)]
l1:
<END>
<END> NEXT:[] PREV:[r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3() {
@@ -312,33 +312,33 @@ fun t3() {
}
---------------------
l0:
<START>
jmp?(l2)
<START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(true)] PREV:[<START>]
l3:
l6:
r(true)
jf(l4)
r(true) NEXT:[jf(l4)] PREV:[jmp?(l2), jmp(l3)]
jf(l4) NEXT:[read (Unit), r(1)] PREV:[r(true)]
l5:
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l7)
jmp(l4)
jmp(l8)
r(1) NEXT:[r(2)] PREV:[jf(l4)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l7)] PREV:[r(>)]
jf(l7) NEXT:[read (Unit), jmp(l4)] PREV:[r(2 > 3)]
jmp(l4) NEXT:[read (Unit)] PREV:[jf(l7)]
jmp(l8) NEXT:[jmp(l3)] PREV:[]
l7:
read (Unit)
read (Unit) NEXT:[jmp(l3)] PREV:[jf(l7)]
l8:
jmp(l3)
jmp(l3) NEXT:[r(true)] PREV:[jmp(l8), read (Unit)]
l4:
read (Unit)
read (Unit) NEXT:[r(2)] PREV:[jf(l4), jmp(l4)]
l2:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l2), read (Unit)]
l1:
<END>
<END> NEXT:[] PREV:[r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3(a : Int) {
@@ -355,37 +355,38 @@ fun t3(a : Int) {
}
---------------------
l0:
<START>
r(1)
r(a)
r(..)
r(1..a)
<START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[r(a)] PREV:[<START>]
r(a) NEXT:[r(..)] PREV:[r(1)]
r(..) NEXT:[r(1..a)] PREV:[r(a)]
r(1..a) NEXT:[w(i)] PREV:[r(..)]
w(i) NEXT:[jmp?(l2)] PREV:[r(1..a)]
l3:
jmp?(l2)
jmp?(l2) NEXT:[read (Unit), jmp?(l6)] PREV:[w(i)]
l4:
l5:
jmp?(l6)
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l7)
r(2)
jmp(l4)
jmp(l8)
jmp?(l6) NEXT:[r(2), r(1)] PREV:[jmp?(l2), jmp(l4), jmp?(l4)]
r(1) NEXT:[r(2)] PREV:[jmp?(l6)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l7)] PREV:[r(>)]
jf(l7) NEXT:[read (Unit), r(2)] PREV:[r(2 > 3)]
r(2) NEXT:[jmp(l4)] PREV:[jf(l7)]
jmp(l4) NEXT:[jmp?(l6)] PREV:[r(2)]
jmp(l8) NEXT:[r(2)] PREV:[]
l7:
read (Unit)
read (Unit) NEXT:[r(2)] PREV:[jf(l7)]
l6:
l8:
r(2)
jmp?(l4)
r(2) NEXT:[jmp?(l4)] PREV:[jmp?(l6), jmp(l8), read (Unit)]
jmp?(l4) NEXT:[jmp?(l6), read (Unit)] PREV:[r(2)]
l2:
read (Unit)
read (Unit) NEXT:[<END>] PREV:[jmp?(l2), jmp?(l4)]
l1:
<END>
<END> NEXT:[] PREV:[read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3(a : Int) {
@@ -403,37 +404,38 @@ fun t3(a : Int) {
}
---------------------
l0:
<START>
jmp?(l2)
r(1)
r(a)
r(..)
r(1..a)
<START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[r(a)] PREV:[jmp?(l2)]
r(a) NEXT:[r(..)] PREV:[r(1)]
r(..) NEXT:[r(1..a)] PREV:[r(a)]
r(1..a) NEXT:[w(i)] PREV:[r(..)]
w(i) NEXT:[jmp?(l3)] PREV:[r(1..a)]
l4:
jmp?(l3)
jmp?(l3) NEXT:[read (Unit), r(1)] PREV:[w(i)]
l5:
l6:
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l7)
jmp(l5)
jmp(l8)
r(1) NEXT:[r(2)] PREV:[jmp?(l3), jmp(l5), jmp?(l5)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l7)] PREV:[r(>)]
jf(l7) NEXT:[read (Unit), jmp(l5)] PREV:[r(2 > 3)]
jmp(l5) NEXT:[r(1)] PREV:[jf(l7)]
jmp(l8) NEXT:[jmp?(l5)] PREV:[]
l7:
read (Unit)
read (Unit) NEXT:[jmp?(l5)] PREV:[jf(l7)]
l8:
jmp?(l5)
jmp?(l5) NEXT:[r(1), read (Unit)] PREV:[jmp(l8), read (Unit)]
l3:
read (Unit)
r(5)
read (Unit) NEXT:[r(5)] PREV:[jmp?(l3), jmp?(l5)]
r(5) NEXT:[r(2)] PREV:[read (Unit)]
l2:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l2), r(5)]
l1:
<END>
<END> NEXT:[] PREV:[r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== t3 ==
fun t3(a : Int) {
@@ -450,36 +452,37 @@ fun t3(a : Int) {
}
---------------------
l0:
<START>
jmp?(l2)
r(1)
r(a)
r(..)
r(1..a)
<START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[r(a)] PREV:[jmp?(l2)]
r(a) NEXT:[r(..)] PREV:[r(1)]
r(..) NEXT:[r(1..a)] PREV:[r(a)]
r(1..a) NEXT:[w(i)] PREV:[r(..)]
w(i) NEXT:[jmp?(l3)] PREV:[r(1..a)]
l4:
jmp?(l3)
jmp?(l3) NEXT:[read (Unit), r(1)] PREV:[w(i)]
l5:
l6:
r(1)
r(2)
r(3)
r(>)
r(2 > 3)
jf(l7)
jmp(l5)
jmp(l8)
r(1) NEXT:[r(2)] PREV:[jmp?(l3), jmp(l5), jmp?(l5)]
r(2) NEXT:[r(3)] PREV:[r(1)]
r(3) NEXT:[r(>)] PREV:[r(2)]
r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
r(2 > 3) NEXT:[jf(l7)] PREV:[r(>)]
jf(l7) NEXT:[read (Unit), jmp(l5)] PREV:[r(2 > 3)]
jmp(l5) NEXT:[r(1)] PREV:[jf(l7)]
jmp(l8) NEXT:[jmp?(l5)] PREV:[]
l7:
read (Unit)
read (Unit) NEXT:[jmp?(l5)] PREV:[jf(l7)]
l8:
jmp?(l5)
jmp?(l5) NEXT:[r(1), read (Unit)] PREV:[jmp(l8), read (Unit)]
l3:
read (Unit)
read (Unit) NEXT:[r(2)] PREV:[jmp?(l3), jmp?(l5)]
l2:
r(2)
r(2) NEXT:[<END>] PREV:[jmp?(l2), read (Unit)]
l1:
<END>
<END> NEXT:[] PREV:[r(2)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== tf ==
fun tf() {
@@ -492,17 +495,17 @@ fun tf() {
}
---------------------
l0:
<START>
jmp?(l2)
r(1)
r(2)
ret(*) l1
ret(*) l1
<START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[r(2)] PREV:[jmp?(l2)]
r(2) NEXT:[ret(*) l1] PREV:[r(1)]
ret(*) l1 NEXT:[<END>] PREV:[r(2)]
ret(*) l1 NEXT:[<END>] PREV:[]
l2:
r(2)
ret(*) l1
r(2) NEXT:[ret(*) l1] PREV:[jmp?(l2)]
ret(*) l1 NEXT:[<END>] PREV:[r(2)]
l1:
<END>
<END> NEXT:[] PREV:[ret(*) l1, ret(*) l1, ret(*) l1]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/cfg/LazyBooleans.instructions
+37 -37
View File
@@ -18,55 +18,55 @@ fun lazyBooleans(a : Boolean, b : Boolean) : Unit {
}
---------------------
l0:
<START>
r(a)
jf(l2)
r(1)
jmp(l3)
<START> NEXT:[r(a)] PREV:[]
r(a) NEXT:[jf(l2)] PREV:[<START>]
jf(l2) NEXT:[r(2), r(1)] PREV:[r(a)]
r(1) NEXT:[jmp(l3)] PREV:[jf(l2)]
jmp(l3) NEXT:[r(3)] PREV:[r(1)]
l2:
r(2)
r(2) NEXT:[r(3)] PREV:[jf(l2)]
l3:
r(3)
r(a)
jf(l4)
r(b)
r(3) NEXT:[r(a)] PREV:[jmp(l3), r(2)]
r(a) NEXT:[jf(l4)] PREV:[r(3)]
jf(l4) NEXT:[jf(l5), r(b)] PREV:[r(a)]
r(b) NEXT:[jf(l5)] PREV:[jf(l4)]
l4:
jf(l5)
r(5)
jmp(l6)
jf(l5) NEXT:[r(6), r(5)] PREV:[jf(l4), r(b)]
r(5) NEXT:[jmp(l6)] PREV:[jf(l5)]
jmp(l6) NEXT:[r(7)] PREV:[r(5)]
l5:
r(6)
r(6) NEXT:[r(7)] PREV:[jf(l5)]
l6:
r(7)
r(a)
jt(l7)
r(b)
r(7) NEXT:[r(a)] PREV:[jmp(l6), r(6)]
r(a) NEXT:[jt(l7)] PREV:[r(7)]
jt(l7) NEXT:[r(b), jf(l8)] PREV:[r(a)]
r(b) NEXT:[jf(l8)] PREV:[jt(l7)]
l7:
jf(l8)
r(8)
jmp(l9)
jf(l8) NEXT:[r(9), r(8)] PREV:[jt(l7), r(b)]
r(8) NEXT:[jmp(l9)] PREV:[jf(l8)]
jmp(l9) NEXT:[r(10)] PREV:[r(8)]
l8:
r(9)
r(9) NEXT:[r(10)] PREV:[jf(l8)]
l9:
r(10)
r(a)
jf(l10)
r(11)
jmp(l11)
r(10) NEXT:[r(a)] PREV:[jmp(l9), r(9)]
r(a) NEXT:[jf(l10)] PREV:[r(10)]
jf(l10) NEXT:[read (Unit), r(11)] PREV:[r(a)]
r(11) NEXT:[jmp(l11)] PREV:[jf(l10)]
jmp(l11) NEXT:[r(12)] PREV:[r(11)]
l10:
read (Unit)
read (Unit) NEXT:[r(12)] PREV:[jf(l10)]
l11:
r(12)
r(a)
jf(l12)
read (Unit)
jmp(l13)
r(12) NEXT:[r(a)] PREV:[jmp(l11), read (Unit)]
r(a) NEXT:[jf(l12)] PREV:[r(12)]
jf(l12) NEXT:[r(13), read (Unit)] PREV:[r(a)]
read (Unit) NEXT:[jmp(l13)] PREV:[jf(l12)]
jmp(l13) NEXT:[r(14)] PREV:[read (Unit)]
l12:
r(13)
r(13) NEXT:[r(14)] PREV:[jf(l12)]
l13:
r(14)
r(14) NEXT:[<END>] PREV:[jmp(l13), r(13)]
l1:
<END>
<END> NEXT:[] PREV:[r(14)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/cfg/OnlyWhileInFunctionBody.instructions
+21 -21
View File
@@ -6,23 +6,23 @@ fun main() {
}
---------------------
l0:
<START>
<START> NEXT:[r(1)] PREV:[]
l2:
l5:
r(1)
r(0)
r(>)
r(1 > 0)
jf(l3)
r(1) NEXT:[r(0)] PREV:[<START>, jmp(l2)]
r(0) NEXT:[r(>)] PREV:[r(1)]
r(>) NEXT:[r(1 > 0)] PREV:[r(0)]
r(1 > 0) NEXT:[jf(l3)] PREV:[r(>)]
jf(l3) NEXT:[read (Unit), r(2)] PREV:[r(1 > 0)]
l4:
r(2)
jmp(l2)
r(2) NEXT:[jmp(l2)] PREV:[jf(l3)]
jmp(l2) NEXT:[r(1)] PREV:[r(2)]
l3:
read (Unit)
read (Unit) NEXT:[<END>] PREV:[jf(l3)]
l1:
<END>
<END> NEXT:[] PREV:[read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
== dowhile ==
fun dowhile() {
@@ -31,20 +31,20 @@ fun dowhile() {
}
---------------------
l0:
<START>
<START> NEXT:[ret l1] PREV:[]
l2:
l4:
ret l1
ret l1 NEXT:[<END>] PREV:[<START>, jt(l2)]
l5:
r(1)
r(0)
r(>)
r(1 > 0)
jt(l2)
r(1) NEXT:[r(0)] PREV:[]
r(0) NEXT:[r(>)] PREV:[r(1)]
r(>) NEXT:[r(1 > 0)] PREV:[r(0)]
r(1 > 0) NEXT:[jt(l2)] PREV:[r(>)]
jt(l2) NEXT:[read (Unit), ret l1] PREV:[r(1 > 0)]
l3:
read (Unit)
read (Unit) NEXT:[<END>] PREV:[jt(l2)]
l1:
<END>
<END> NEXT:[] PREV:[ret l1, read (Unit)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/cfg/ReturnFromExpression.instructions
+8 -8
View File
@@ -4,15 +4,15 @@ fun blockAndAndMismatch() : Boolean {
}
---------------------
l0:
<START>
r(false)
jt(l2)
r(false)
ret(*) l1
<START> NEXT:[r(false)] PREV:[]
r(false) NEXT:[jt(l2)] PREV:[<START>]
jt(l2) NEXT:[r(false), r(false || (return false))] PREV:[r(false)]
r(false) NEXT:[ret(*) l1] PREV:[jt(l2)]
ret(*) l1 NEXT:[<END>] PREV:[r(false)]
l2:
r(false || (return false))
r(false || (return false)) NEXT:[<END>] PREV:[jt(l2)]
l1:
<END>
<END> NEXT:[] PREV:[ret(*) l1, r(false || (return false))]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/cfg/ShortFunction.instructions
+4 -4
View File
@@ -2,10 +2,10 @@
fun short() = 1
---------------------
l0:
<START>
r(1)
<START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[<END>] PREV:[<START>]
l1:
<END>
<END> NEXT:[] PREV:[r(1)]
error:
<ERROR>
<ERROR> NEXT:[] PREV:[]
=====================
compiler/testData/checker/infos/Autocasts.jet
+2 -4
View File
@@ -6,8 +6,7 @@ class B() : A() {
fun bar() {}
}
fun f9() {
val a : A?
fun f9(a : A?) {
a?.foo()
a?.<error descr="Unresolved reference: bar">bar</error>()
if (a is B) {
@@ -30,8 +29,7 @@ fun f9() {
<info descr="Automatically cast to A">a</info>.foo()
}
fun f10() {
val a : A?
fun f10(a : A?) {
if (!(a is B)) {
return;
}
compiler/testData/checker/regression/OverrideResolution.jet
+4 -4
View File
@@ -1,16 +1,16 @@
fun box() {
val a : C
val a : C = C()
a.foo()
}
open class A {
open class A() {
open fun foo() {}
}
open class B : A {
open class B() : A() {
override fun foo() {}
}
open class C : B {
open class C() : B() {
override fun foo() {}
}
compiler/testData/checkerWithErrorTypes/full/infos/Autocasts.jet
+4 -4
View File
@@ -6,8 +6,8 @@ class B() : A() {
fun bar() {}
}
fun f9() {
val a : A?
fun f9(init : A?) {
val a : A? = init
a?.foo()
a?.<!UNRESOLVED_REFERENCE!>bar<!>()
if (a is B) {
@@ -30,8 +30,8 @@ fun f9() {
a.foo()
}
fun f10() {
val a : A?
fun f10(init : A?) {
val a : A? = init
if (!(a is B)) {
return;
}
compiler/testData/checkerWithErrorTypes/full/regression/OverrideResolution.jet
+2 -2
View File
@@ -1,5 +1,5 @@
fun box() {
val a : C
fun box(c : C) {
val a : C = c
a.foo()
}