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

order of declaration changed in tests

Browse Source
This commit is contained in:
Svetlana Isakova
2012-05-26 12:46:38 +04:00
parent 0bf65bfe1e
commit 7a02cfcd25
4 changed files with 143 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/AnonymousInitializers.instructions
+13 -13
View File
@@ -1,16 +1,3 @@
== get_j ==
get() = 20
---------------------
l0:
<START> NEXT:[r(20)] PREV:[]
r(20) NEXT:[<END>] PREV:[<START>]
l1:
<END> NEXT:[<SINK>] PREV:[r(20)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== AnonymousInitializers == == AnonymousInitializers ==
class AnonymousInitializers() { class AnonymousInitializers() {
val k = 34 val k = 34
@@ -59,3 +46,16 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== get_j ==
get() = 20
---------------------
l3:
<START> NEXT:[r(20)] PREV:[]
r(20) NEXT:[<END>] PREV:[<START>]
l4:
<END> NEXT:[<SINK>] PREV:[r(20)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/Basic.instructions
+13 -13
View File
@@ -1,16 +1,3 @@
== anonymous_0 ==
{1}
---------------------
l3:
<START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[<END>] PREV:[<START>]
l4:
<END> NEXT:[<SINK>] PREV:[r(1)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== f == == f ==
fun f(a : Boolean) : Unit { fun f(a : Boolean) : Unit {
1 1
@@ -91,6 +78,19 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== anonymous_0 ==
{1}
---------------------
l3:
<START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[<END>] PREV:[<START>]
l4:
<END> NEXT:[<SINK>] PREV:[r(1)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== foo == == foo ==
fun foo(a : Boolean, b : Int) : Unit {} fun foo(a : Boolean, b : Int) : Unit {}
--------------------- ---------------------
compiler/testData/cfg/Finally.instructions
+63 -63
View File
@@ -69,33 +69,6 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== anonymous_0 ==
{ () =>
if (2 > 3) {
return@
}
}
---------------------
l3:
<START> NEXT:[r(())] PREV:[]
r(()) NEXT:[r(2)] PREV:[<START>]
r(2) NEXT:[r(3)] PREV:[r(())]
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) NEXT:[<END>] PREV:[jf(l5)]
l4:
l6:
<END> NEXT:[<SINK>] PREV:[ret l4, read (Unit)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== t3 == == t3 ==
fun t3() { fun t3() {
try { try {
@@ -164,50 +137,32 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== anonymous_1 == == anonymous_0 ==
{ () => { () =>
try { if (2 > 3) {
1 return@
if (2 > 3) { }
return@
}
} finally {
2
} }
}
--------------------- ---------------------
l3: l3:
<START> NEXT:[r(())] PREV:[] <START> NEXT:[r(())] PREV:[]
r(()) NEXT:[r(try { 1 if (2 > 3) { retur..)] PREV:[<START>] r(()) NEXT:[r(2)] PREV:[<START>]
r(try { r(2) NEXT:[r(3)] PREV:[r(())]
1 r(3) NEXT:[r(>)] PREV:[r(2)]
if (2 > 3) { r(>) NEXT:[r(2 > 3)] PREV:[r(3)]
return@ r(2 > 3) NEXT:[jf(l5)] PREV:[r(>)]
} jf(l5) NEXT:[read (Unit), ret l4] PREV:[r(2 > 3)]
} finally { ret l4 NEXT:[<END>] PREV:[jf(l5)]
2 - jmp(l6) NEXT:[<END>] PREV:[]
}) NEXT:[r(1)] PREV:[r(())]
r(1) NEXT:[r(2)] PREV:[r(try { 1 if (2 > 3) { retur..)]
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 l4] PREV:[jf(l5)]
ret l4 NEXT:[<END>] PREV:[r(2)]
- jmp(l6) NEXT:[r(2)] PREV:[]
l5: l5:
read (Unit) NEXT:[r(2)] PREV:[jf(l5)] read (Unit) NEXT:[<END>] PREV:[jf(l5)]
l6:
l7:
r(2) NEXT:[<END>] PREV:[read (Unit)]
l4: l4:
l8: l6:
<END> NEXT:[<SINK>] PREV:[ret l4, r(2)] <END> NEXT:[<SINK>] PREV:[ret l4, read (Unit)]
error: error:
<ERROR> NEXT:[<SINK>] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t4 == == t4 ==
fun t4() { fun t4() {
@@ -286,6 +241,51 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== anonymous_1 ==
{ () =>
try {
1
if (2 > 3) {
return@
}
} finally {
2
}
}
---------------------
l3:
<START> NEXT:[r(())] PREV:[]
r(()) NEXT:[r(try { 1 if (2 > 3) { retur..)] PREV:[<START>]
r(try {
1
if (2 > 3) {
return@
}
} finally {
2
}) NEXT:[r(1)] PREV:[r(())]
r(1) NEXT:[r(2)] PREV:[r(try { 1 if (2 > 3) { retur..)]
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 l4] PREV:[jf(l5)]
ret l4 NEXT:[<END>] PREV:[r(2)]
- jmp(l6) NEXT:[r(2)] PREV:[]
l5:
read (Unit) NEXT:[r(2)] PREV:[jf(l5)]
l6:
l7:
r(2) NEXT:[<END>] PREV:[read (Unit)]
l4:
l8:
<END> NEXT:[<SINK>] PREV:[ret l4, r(2)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== t5 == == t5 ==
fun t5() { fun t5() {
@ while(true) { @ while(true) {
compiler/testData/cfg/LocalDeclarations.instructions
+54 -102
View File
@@ -29,53 +29,6 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== O ==
object O {
val x : Int
{
$x = 1
}
}
---------------------
l0:
<START> NEXT:[v(val x : Int)] PREV:[]
v(val x : Int) NEXT:[r(1)] PREV:[<START>]
r(1) NEXT:[w($x)] PREV:[v(val x : Int)]
w($x) NEXT:[<END>] PREV:[r(1)]
l1:
<END> NEXT:[<SINK>] PREV:[w($x)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== null ==
object {
val x : Int
{
$x = 1
}
fun foo() {
val b : Int = 1
doSmth(b)
}
}
---------------------
l0:
<START> NEXT:[v(val x : Int)] PREV:[]
v(val x : Int) NEXT:[r(1)] PREV:[<START>]
r(1) NEXT:[w($x)] PREV:[v(val x : Int)]
w($x) NEXT:[<END>] PREV:[r(1)]
l1:
<END> NEXT:[<SINK>] PREV:[w($x)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== doSmth == == doSmth ==
fun doSmth(i: Int) {} fun doSmth(i: Int) {}
--------------------- ---------------------
@@ -126,6 +79,26 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== O ==
object O {
val x : Int
{
$x = 1
}
}
---------------------
l0:
<START> NEXT:[v(val x : Int)] PREV:[]
v(val x : Int) NEXT:[r(1)] PREV:[<START>]
r(1) NEXT:[w($x)] PREV:[v(val x : Int)]
w($x) NEXT:[<END>] PREV:[r(1)]
l1:
<END> NEXT:[<SINK>] PREV:[w($x)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== test2 == == test2 ==
fun test2() { fun test2() {
val b = 1 val b = 1
@@ -156,22 +129,6 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== inner_bar ==
fun inner_bar() {
y = 10
}
---------------------
l3:
<START> NEXT:[r(10)] PREV:[]
r(10) NEXT:[w(y)] PREV:[<START>]
w(y) NEXT:[<END>] PREV:[r(10)]
l4:
<END> NEXT:[<SINK>] PREV:[w(y)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== test3 == == test3 ==
fun test3() { fun test3() {
val a = object { val a = object {
@@ -220,8 +177,8 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== ggg == == inner_bar ==
fun ggg() { fun inner_bar() {
y = 10 y = 10
} }
--------------------- ---------------------
@@ -299,33 +256,17 @@ error:
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== foo == == ggg ==
fun foo() { fun ggg() {
x = 3 y = 10
} }
--------------------- ---------------------
l3: l3:
<START> NEXT:[r(3)] PREV:[] <START> NEXT:[r(10)] PREV:[]
r(3) NEXT:[w(x)] PREV:[<START>] r(10) NEXT:[w(y)] PREV:[<START>]
w(x) NEXT:[<END>] PREV:[r(3)] w(y) NEXT:[<END>] PREV:[r(10)]
l4: l4:
<END> NEXT:[<SINK>] PREV:[w(x)] <END> NEXT:[<SINK>] PREV:[w(y)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== bar ==
fun bar() {
x = 4
}
---------------------
l6:
<START> NEXT:[r(4)] PREV:[]
r(4) NEXT:[w(x)] PREV:[<START>]
w(x) NEXT:[<END>] PREV:[r(4)]
l7:
<END> NEXT:[<SINK>] PREV:[w(x)]
error: error:
<ERROR> NEXT:[<SINK>] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
@@ -418,22 +359,33 @@ sink:
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
val b : Int = 1 x = 3
doSmth(b)
} }
--------------------- ---------------------
l0: l3:
<START> NEXT:[v(val b : Int = 1)] PREV:[] <START> NEXT:[r(3)] PREV:[]
v(val b : Int = 1) NEXT:[r(1)] PREV:[<START>] r(3) NEXT:[w(x)] PREV:[<START>]
r(1) NEXT:[w(b)] PREV:[v(val b : Int = 1)] w(x) NEXT:[<END>] PREV:[r(3)]
w(b) NEXT:[r(b)] PREV:[r(1)] l4:
r(b) NEXT:[r(doSmth)] PREV:[w(b)] <END> NEXT:[<SINK>] PREV:[w(x)]
r(doSmth) NEXT:[r(doSmth(b))] PREV:[r(b)]
r(doSmth(b)) NEXT:[<END>] PREV:[r(doSmth)]
l1:
<END> NEXT:[<SINK>] PREV:[r(doSmth(b))]
error: error:
<ERROR> NEXT:[<SINK>] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== bar ==
fun bar() {
x = 4
}
---------------------
l6:
<START> NEXT:[r(4)] PREV:[]
r(4) NEXT:[w(x)] PREV:[<START>]
w(x) NEXT:[<END>] PREV:[r(4)]
l7:
<END> NEXT:[<SINK>] PREV:[w(x)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================