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

Added/updated tests for LexicalScope.

Browse Source
This commit is contained in:
Svetlana Isakova
2014-03-05 19:32:10 +04:00
parent 2cfcd1783b
commit 006f3ccbe9
81 changed files with 1404 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.instructions
+5 -5
View File
@@ -16,20 +16,20 @@ class AnonymousInitializers() {
}
---------------------
L0:
<START>
1 <START>
v(val k = 34)
r(34)
w(k)
v(val i: Int)
mark({ $i = 12 })
2 mark({ $i = 12 })
r(12)
w($i)
v(val j: Int get() = 20)
mark({ $i = 13 })
1 v(val j: Int get() = 20)
2 mark({ $i = 13 })
r(13)
w($i)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.instructions
+6 -6
View File
@@ -4,15 +4,15 @@ fun foo() {
}
---------------------
L0:
<START>
mark({ {} })
1 <START>
2 mark({ {} })
mark({})
jmp?(L2) NEXT:[r({}), d({})]
d({}) NEXT:[<SINK>]
L2:
r({}) PREV:[jmp?(L2)]
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -22,11 +22,11 @@ sink:
{}
---------------------
L3:
<START>
mark()
3 <START>
4 mark()
read (Unit)
L4:
<END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/functions/FailFunction.instructions
+3 -3
View File
@@ -4,15 +4,15 @@ fun fail() : Nothing {
}
---------------------
L0:
<START>
mark({ throw java.lang.RuntimeException() })
1 <START>
2 mark({ throw java.lang.RuntimeException() })
mark(throw java.lang.RuntimeException())
mark(java.lang.RuntimeException())
mark(RuntimeException())
call(RuntimeException, <init>)
throw (throw java.lang.RuntimeException()) NEXT:[<ERROR>]
L1:
<END> NEXT:[<SINK>] PREV:[]
1 <END> NEXT:[<SINK>] PREV:[]
error:
<ERROR> PREV:[throw (throw java.lang.RuntimeException())]
sink:
compiler/testData/cfg/declarations/functions/typeParameter.instructions
+3 -3
View File
@@ -4,11 +4,11 @@ fun <T> foo() {
}
---------------------
L0:
<START>
mark({ T })
1 <START>
2 mark({ T })
error(T, No resolved call)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/local/LocalDeclarations.instructions
+40 -40
View File
@@ -18,7 +18,7 @@ class C() {
}
---------------------
L0:
<START>
1 <START>
v(val a: Int = 1)
r(1)
w(a)
@@ -33,13 +33,13 @@ sink:
fun doSmth(i: Int) {}
---------------------
L0:
<START>
1 <START>
v(i: Int)
w(i)
mark({})
2 mark({})
read (Unit)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -56,18 +56,18 @@ fun test1() {
}
---------------------
L0:
<START>
mark({ val a = object { val x : Int { $x = 1 } } })
1 <START>
2 mark({ val a = object { val x : Int { $x = 1 } } })
v(val a = object { val x : Int { $x = 1 } })
mark(object { val x : Int { $x = 1 } })
v(val x : Int)
mark({ $x = 1 })
3 mark({ $x = 1 })
r(1)
w($x)
r(object { val x : Int { $x = 1 } })
2 r(object { val x : Int { $x = 1 } })
w(a)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -82,13 +82,13 @@ object O {
}
---------------------
L0:
<START>
1 <START>
v(val x : Int)
mark({ $x = 1 })
2 mark({ $x = 1 })
r(1)
w($x)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -103,8 +103,8 @@ fun test2() {
}
---------------------
L0:
<START>
mark({ val b = 1 val a = object { val x = b } })
1 <START>
2 mark({ val b = 1 val a = object { val x = b } })
v(val b = 1)
r(1)
w(b)
@@ -116,7 +116,7 @@ L0:
r(object { val x = b })
w(a)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -133,8 +133,8 @@ fun test3() {
}
---------------------
L0:
<START>
mark({ val a = object { val y : Int fun inner_bar() { y = 10 } } })
1 <START>
2 mark({ val a = object { val y : Int fun inner_bar() { y = 10 } } })
v(val a = object { val y : Int fun inner_bar() { y = 10 } })
mark(object { val y : Int fun inner_bar() { y = 10 } })
v(val y : Int)
@@ -144,7 +144,7 @@ L2:
r(object { val y : Int fun inner_bar() { y = 10 } }) PREV:[jmp?(L2)]
w(a)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -156,12 +156,12 @@ fun inner_bar() {
}
---------------------
L3:
<START>
mark({ y = 10 })
3 <START>
4 mark({ y = 10 })
r(10)
w(y)
L4:
<END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -182,22 +182,22 @@ fun test4() {
}
---------------------
L0:
<START>
mark({ val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } })
1 <START>
2 mark({ val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } })
v(val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } })
mark(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } })
v(val x : Int)
v(val y : Int)
mark({ $x = 1 })
3 mark({ $x = 1 })
r(1)
w($x)
jmp?(L2) NEXT:[r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }), d(fun ggg() { y = 10 })]
2 jmp?(L2) NEXT:[r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }), d(fun ggg() { y = 10 })]
d(fun ggg() { y = 10 }) NEXT:[<SINK>]
L2:
r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) PREV:[jmp?(L2)]
w(a)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -209,12 +209,12 @@ fun ggg() {
}
---------------------
L3:
<START>
mark({ y = 10 })
3 <START>
4 mark({ y = 10 })
r(10)
w(y)
L4:
<END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -237,17 +237,17 @@ fun test5() {
}
---------------------
L0:
<START>
mark({ val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } })
1 <START>
2 mark({ val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } })
v(val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
mark(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
v(var x = 1)
r(1)
w(x)
mark({ $x = 2 })
3 mark({ $x = 2 })
r(2)
w($x)
jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })]
2 jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })]
d(fun foo() { x = 3 }) NEXT:[<SINK>]
L2:
jmp?(L5) NEXT:[r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }), d(fun bar() { x = 4 })] PREV:[jmp?(L2)]
@@ -256,7 +256,7 @@ L5:
r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) PREV:[jmp?(L5)]
w(a)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -268,12 +268,12 @@ fun foo() {
}
---------------------
L3:
<START>
mark({ x = 3 })
3 <START>
4 mark({ x = 3 })
r(3)
w(x)
L4:
<END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
@@ -285,12 +285,12 @@ fun bar() {
}
---------------------
L6:
<START>
mark({ x = 4 })
3 <START>
4 mark({ x = 4 })
r(4)
w(x)
L7:
<END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/local/ObjectExpression.instructions
+7 -7
View File
@@ -4,7 +4,7 @@ trait A {
}
---------------------
L0:
<START>
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
@@ -16,7 +16,7 @@ sink:
fun foo() : Int
---------------------
L0:
<START>
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
@@ -30,7 +30,7 @@ class B : A {
}
---------------------
L0:
<START>
1 <START>
unsupported(DELEGATOR_SUPER_CLASS : A)
L1:
<END> NEXT:[<SINK>]
@@ -43,7 +43,7 @@ sink:
override fun foo() = 10
---------------------
L0:
<START>
1 <START>
r(10)
L1:
<END> NEXT:[<SINK>]
@@ -59,10 +59,10 @@ fun foo(b: B) : Int {
}
---------------------
L0:
<START>
1 <START>
v(b: B)
w(b)
mark({ val o = object : A by b {} return o.foo() })
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)
@@ -74,7 +74,7 @@ L0:
call(foo, foo)
ret(*) L1
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/local/localClass.instructions
+9 -9
View File
@@ -12,13 +12,13 @@ fun f() {
}
---------------------
L0:
<START>
mark({ class LocalClass() { fun f() { val x = "" fun loc() { val x3 = "" } } } })
1 <START>
2 mark({ class LocalClass() { fun f() { val x = "" fun loc() { val x3 = "" } } } })
jmp?(L2) NEXT:[<END>, d(fun f() { val x = "" fun loc() { val x3 = "" } })]
d(fun f() { val x = "" fun loc() { val x3 = "" } }) NEXT:[<SINK>]
L1:
L2:
<END> NEXT:[<SINK>] PREV:[jmp?(L2)]
1 <END> NEXT:[<SINK>] PREV:[jmp?(L2)]
error:
<ERROR> PREV:[]
sink:
@@ -34,8 +34,8 @@ fun f() {
}
---------------------
L3:
<START>
mark({ val x = "" fun loc() { val x3 = "" } })
3 <START>
4 mark({ val x = "" fun loc() { val x3 = "" } })
v(val x = "")
mark("")
r("")
@@ -44,7 +44,7 @@ L3:
d(fun loc() { val x3 = "" }) NEXT:[<SINK>]
L4:
L5:
<END> NEXT:[<SINK>] PREV:[jmp?(L5)]
3 <END> NEXT:[<SINK>] PREV:[jmp?(L5)]
error:
<ERROR> PREV:[]
sink:
@@ -56,14 +56,14 @@ fun loc() {
}
---------------------
L6:
<START>
mark({ val x3 = "" })
5 <START>
6 mark({ val x3 = "" })
v(val x3 = "")
mark("")
r("")
w(x3)
L7:
<END> NEXT:[<SINK>]
5 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/local/localProperty.instructions
+6 -6
View File
@@ -10,14 +10,14 @@ fun foo() {
}
---------------------
L0:
<START>
mark({ class B { val a: Int get() { val b: Int return b } } })
1 <START>
2 mark({ class B { val a: Int get() { val b: Int return b } } })
v(val a: Int get() { val b: Int return b })
jmp?(L2) NEXT:[<END>, d(get() { val b: Int return b })]
d(get() { val b: Int return b }) NEXT:[<SINK>]
L1:
L2:
<END> NEXT:[<SINK>] PREV:[jmp?(L2)]
1 <END> NEXT:[<SINK>] PREV:[jmp?(L2)]
error:
<ERROR> PREV:[]
sink:
@@ -30,13 +30,13 @@ get() {
}
---------------------
L3:
<START>
mark({ val b: Int return b })
3 <START>
4 mark({ val b: Int return b })
v(val b: Int)
r(b)
ret(*) L4
L4:
<END> NEXT:[<SINK>]
3 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.instructions
+6 -6
View File
@@ -5,7 +5,7 @@ class C {
}
---------------------
L0:
<START>
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
@@ -17,7 +17,7 @@ sink:
fun component1() = 1
---------------------
L0:
<START>
1 <START>
r(1)
L1:
<END> NEXT:[<SINK>]
@@ -30,7 +30,7 @@ sink:
fun component2() = 2
---------------------
L0:
<START>
1 <START>
r(2)
L1:
<END> NEXT:[<SINK>]
@@ -46,10 +46,10 @@ fun test(c: C) {
}
---------------------
L0:
<START>
1 <START>
v(c: C)
w(c)
mark({ val (a, b) = c val d = 1 })
2 mark({ val (a, b) = c val d = 1 })
r(c)
v(a)
call(a, component1)
@@ -61,7 +61,7 @@ L0:
r(1)
w(d)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.instructions
+3 -3
View File
@@ -5,10 +5,10 @@ fun foo(x: Int) {
}
---------------------
L0:
<START>
1 <START>
v(x: Int)
w(x)
mark({ val (a, b) = x a })
2 mark({ val (a, b) = x a })
r(x)
v(a)
w(a)
@@ -16,7 +16,7 @@ L0:
w(b)
r(a)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/properties/DelegatedProperty.instructions
+4 -4
View File
@@ -4,7 +4,7 @@ class Delegate {
}
---------------------
L0:
<START>
1 <START>
L1:
<END> NEXT:[<SINK>]
error:
@@ -16,7 +16,7 @@ sink:
fun get(_this: Any, p: PropertyMetadata): Int = 0
---------------------
L0:
<START>
1 <START>
v(_this: Any)
w(_this)
v(p: PropertyMetadata)
@@ -33,7 +33,7 @@ sink:
val a = Delegate()
---------------------
L0:
<START>
1 <START>
v(val a = Delegate())
mark(Delegate())
call(Delegate, <init>)
@@ -49,7 +49,7 @@ sink:
val b by a
---------------------
L0:
<START>
1 <START>
v(val b by a)
r(a)
L1:
compiler/testData/cfg/declarations/properties/backingFieldAccess.instructions
+3 -3
View File
@@ -9,12 +9,12 @@ class C {
}
---------------------
L0:
<START>
1 <START>
v(val a: Int get() = 1)
mark({ $a })
2 mark({ $a })
r($a)
L1:
<END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.instructions
+2 -2
View File
@@ -5,7 +5,7 @@ abstract class Bar {
}
---------------------
L0:
<START>
1 <START>
v(abstract var bar : String)
L1:
<END> NEXT:[<SINK>]
@@ -18,7 +18,7 @@ sink:
fun foo() = "foo" + this.$bar
---------------------
L0:
<START>
1 <START>
mark("foo" + this.$bar)
mark("foo")
r("foo")