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

fix tests by adding missing 'init' keywords to testdata

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-27 13:23:15 +02:00
parent 98b8784ab0
commit f93eeeb563
130 changed files with 277 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg-variables/basic/InitializedNotDeclared.instructions
+1 -1
View File
@@ -1,6 +1,6 @@
== A ==
class A {
{
init {
x = 1
}
val x: Int
compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
{
init {
x = 1
}
val x: Int
compiler/testData/cfg-variables/basic/InitializedNotDeclared.values
+1 -1
View File
@@ -1,6 +1,6 @@
== A ==
class A {
{
init {
x = 1
}
val x: Int
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.instructions
+15 -15
View File
@@ -69,7 +69,7 @@ sink:
== TestObjectLiteral ==
class TestObjectLiteral {
val obj: A = object: A(obj) {
{
init {
val x = obj
}
fun foo() {
@@ -79,29 +79,29 @@ class TestObjectLiteral {
}
---------------------
L0:
1 <START> INIT: in: {} out: {}
v(val obj: A = object: A(obj) { { val x = obj } fun foo() { val y = obj } }) INIT: in: {} out: {obj=D}
mark(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) INIT: in: {obj=D} out: {obj=D}
1 <START> INIT: in: {} out: {}
v(val obj: A = object: A(obj) { init { val x = obj } fun foo() { val y = obj } }) INIT: in: {} out: {obj=D}
mark(object: A(obj) { init { val x = obj } fun foo() { val y = obj } }) INIT: in: {obj=D} out: {obj=D}
magic[IMPLICIT_RECEIVER](obj) -> <v0>
r(obj|<v0>) -> <v1>
mark(A(obj))
call(A(obj), <init>|<v1>) -> <v2>
2 mark({ val x = obj })
v(val x = obj) INIT: in: {obj=D} out: {obj=D, x=D}
magic[IMPLICIT_RECEIVER](obj) -> <v3> INIT: in: {obj=D, x=D} out: {obj=D, x=D}
v(val x = obj) INIT: in: {obj=D} out: {obj=D, x=D}
magic[IMPLICIT_RECEIVER](obj) -> <v3> INIT: in: {obj=D, x=D} out: {obj=D, x=D}
r(obj|<v3>) -> <v4>
w(x|<v4>) INIT: in: {obj=D, x=D} out: {obj=D, x=ID}
1 jmp?(L2) INIT: in: {obj=D} out: {obj=D}
d(fun foo() { val y = obj }) USE: in: {obj=READ} out: {obj=READ}
w(x|<v4>) INIT: in: {obj=D, x=D} out: {obj=D, x=ID}
1 jmp?(L2) INIT: in: {obj=D} out: {obj=D}
d(fun foo() { val y = obj }) USE: in: {obj=READ} out: {obj=READ}
L2 [after local declaration]:
r(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) -> <v5>
w(obj|<v5>) INIT: in: {obj=D} out: {obj=ID}
r(object: A(obj) { init { val x = obj } fun foo() { val y = obj } }) -> <v5>
w(obj|<v5>) INIT: in: {obj=D} out: {obj=ID}
L1:
<END> INIT: in: {obj=ID} out: {obj=ID}
<END> INIT: in: {obj=ID} out: {obj=ID}
error:
<ERROR> INIT: in: {} out: {}
<ERROR> INIT: in: {} out: {}
sink:
<SINK> INIT: in: {obj=D} out: {obj=D} USE: in: {} out: {}
<SINK> INIT: in: {obj=D} out: {obj=D} USE: in: {} out: {}
=====================
== foo ==
fun foo() {
@@ -142,4 +142,4 @@ error:
<ERROR> INIT: in: {} out: {}
sink:
<SINK> INIT: in: {x=ID} out: {x=ID} USE: in: {} out: {}
=====================
=====================
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt
+1 -1
View File
@@ -8,7 +8,7 @@ open class A(val a: A)
class TestObjectLiteral {
val obj: A = object: A(obj) {
{
init {
val x = obj
}
fun foo() {
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.values
+7 -7
View File
@@ -31,7 +31,7 @@ open class A(val a: A)
== TestObjectLiteral ==
class TestObjectLiteral {
val obj: A = object: A(obj) {
{
init {
val x = obj
}
fun foo() {
@@ -40,12 +40,12 @@ class TestObjectLiteral {
}
}
---------------------
<v0>: TestObjectLiteral NEW: magic[IMPLICIT_RECEIVER](obj) -> <v0>
<v3>: TestObjectLiteral NEW: magic[IMPLICIT_RECEIVER](obj) -> <v3>
obj <v1>: {<: A} NEW: r(obj|<v0>) -> <v1>
A(obj) <v2>: * NEW: call(A(obj), <init>|<v1>) -> <v2>
obj <v4>: {<: A} NEW: r(obj|<v3>) -> <v4>
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v5>: {<: A} NEW: r(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) -> <v5>
<v0>: TestObjectLiteral NEW: magic[IMPLICIT_RECEIVER](obj) -> <v0>
<v3>: TestObjectLiteral NEW: magic[IMPLICIT_RECEIVER](obj) -> <v3>
obj <v1>: {<: A} NEW: r(obj|<v0>) -> <v1>
A(obj) <v2>: * NEW: call(A(obj), <init>|<v1>) -> <v2>
obj <v4>: {<: A} NEW: r(obj|<v3>) -> <v4>
object: A(obj) { init { val x = obj } fun foo() { val y = obj } } <v5>: {<: A} NEW: r(object: A(obj) { init { val x = obj } fun foo() { val y = obj } }) -> <v5>
=====================
== foo ==
fun foo() {
compiler/testData/cfg-variables/lexicalScopes/localClass.instructions
+15 -15
View File
@@ -2,7 +2,7 @@
fun foo() {
"before"
class A(val x: Int) {
{
init {
val a = x
}
fun foo() {
@@ -13,29 +13,29 @@ fun foo() {
}
---------------------
L0:
1 <START> INIT: in: {} out: {}
2 mark({ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" })
1 <START> INIT: in: {} out: {}
2 mark({ "before" class A(val x: Int) { init { val a = x } fun foo() { val b = x } } "after" })
mark("before")
r("before") -> <v0>
v(val x: Int) INIT: in: {} out: {x=D}
magic[FAKE_INITIALIZER](val x: Int) -> <v1> INIT: in: {x=D} out: {x=D}
w(x|<v1>) INIT: in: {x=D} out: {x=ID}
3 mark({ val a = x }) INIT: in: {x=ID} out: {x=ID}
v(val a = x) INIT: in: {x=ID} out: {a=D, x=ID}
magic[IMPLICIT_RECEIVER](x) -> <v2> INIT: in: {a=D, x=ID} out: {a=D, x=ID}
v(val x: Int) INIT: in: {} out: {x=D}
magic[FAKE_INITIALIZER](val x: Int) -> <v1> INIT: in: {x=D} out: {x=D}
w(x|<v1>) INIT: in: {x=D} out: {x=ID}
3 mark({ val a = x }) INIT: in: {x=ID} out: {x=ID}
v(val a = x) INIT: in: {x=ID} out: {a=D, x=ID}
magic[IMPLICIT_RECEIVER](x) -> <v2> INIT: in: {a=D, x=ID} out: {a=D, x=ID}
r(x|<v2>) -> <v3>
w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
2 jmp?(L2) INIT: in: {x=ID} out: {x=ID}
d(fun foo() { val b = x }) USE: in: {x=READ} out: {x=READ}
w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
2 jmp?(L2) INIT: in: {x=ID} out: {x=ID}
d(fun foo() { val b = x }) USE: in: {x=READ} out: {x=READ}
L2 [after local declaration]:
mark("after")
r("after") -> <v4>
L1:
1 <END> INIT: in: {} out: {}
1 <END> INIT: in: {} out: {}
error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
<SINK> USE: in: {} out: {}
=====================
== foo ==
fun foo() {
@@ -55,4 +55,4 @@ error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
=====================
=====================
compiler/testData/cfg-variables/lexicalScopes/localClass.kt
+1 -1
View File
@@ -1,7 +1,7 @@
fun foo() {
"before"
class A(val x: Int) {
{
init {
val a = x
}
fun foo() {
compiler/testData/cfg-variables/lexicalScopes/localClass.values
+7 -7
View File
@@ -2,7 +2,7 @@
fun foo() {
"before"
class A(val x: Int) {
{
init {
val a = x
}
fun foo() {
@@ -12,12 +12,12 @@ fun foo() {
"after"
}
---------------------
<v1>: Int NEW: magic[FAKE_INITIALIZER](val x: Int) -> <v1>
<v2>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
x <v3>: Int NEW: r(x|<v2>) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
<v1>: Int NEW: magic[FAKE_INITIALIZER](val x: Int) -> <v1>
<v2>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
x <v3>: Int NEW: r(x|<v2>) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" class A(val x: Int) { init { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
=====================
== foo ==
fun foo() {
compiler/testData/cfg-variables/lexicalScopes/localObject.instructions
+9 -9
View File
@@ -2,7 +2,7 @@
fun foo() {
"before"
object A {
{
init {
val a = 1
}
fun foo() {
@@ -13,15 +13,15 @@ fun foo() {
}
---------------------
L0:
1 <START> INIT: in: {} out: {}
2 mark({ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" })
1 <START> INIT: in: {} out: {}
2 mark({ "before" object A { init { val a = 1 } fun foo() { val b = 2 } } "after" })
mark("before")
r("before") -> <v0>
3 mark({ val a = 1 })
v(val a = 1) INIT: in: {} out: {a=D}
r(1) -> <v1> INIT: in: {a=D} out: {a=D}
w(a|<v1>) INIT: in: {a=D} out: {a=ID}
2 jmp?(L2) INIT: in: {} out: {}
v(val a = 1) INIT: in: {} out: {a=D}
r(1) -> <v1> INIT: in: {a=D} out: {a=D}
w(a|<v1>) INIT: in: {a=D} out: {a=ID}
2 jmp?(L2) INIT: in: {} out: {}
d(fun foo() { val b = 2 })
L2 [after local declaration]:
mark("after")
@@ -31,7 +31,7 @@ L1:
error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
<SINK> USE: in: {} out: {}
=====================
== foo ==
fun foo() {
@@ -50,4 +50,4 @@ error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
=====================
=====================
compiler/testData/cfg-variables/lexicalScopes/localObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
fun foo() {
"before"
object A {
{
init {
val a = 1
}
fun foo() {
compiler/testData/cfg-variables/lexicalScopes/localObject.values
+5 -5
View File
@@ -2,7 +2,7 @@
fun foo() {
"before"
object A {
{
init {
val a = 1
}
fun foo() {
@@ -12,10 +12,10 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" object A { init { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
=====================
== foo ==
fun foo() {
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.instructions
+14 -14
View File
@@ -2,7 +2,7 @@
fun foo() {
"before"
val bar = object {
{
init {
val x = 1
}
fun foo() {
@@ -13,29 +13,29 @@ fun foo() {
}
---------------------
L0:
1 <START> INIT: in: {} out: {}
2 mark({ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" })
1 <START> INIT: in: {} out: {}
2 mark({ "before" val bar = object { init { val x = 1 } fun foo() { val a = 2 } } "after" })
mark("before")
r("before") -> <v0>
v(val bar = object { { val x = 1 } fun foo() { val a = 2 } }) INIT: in: {} out: {bar=D}
mark(object { { val x = 1 } fun foo() { val a = 2 } }) INIT: in: {bar=D} out: {bar=D}
v(val bar = object { init { val x = 1 } fun foo() { val a = 2 } }) INIT: in: {} out: {bar=D}
mark(object { init { val x = 1 } fun foo() { val a = 2 } }) INIT: in: {bar=D} out: {bar=D}
3 mark({ val x = 1 })
v(val x = 1) INIT: in: {bar=D} out: {bar=D, x=D}
r(1) -> <v1> INIT: in: {bar=D, x=D} out: {bar=D, x=D}
w(x|<v1>) INIT: in: {bar=D, x=D} out: {bar=D, x=ID}
2 jmp?(L2) INIT: in: {bar=D} out: {bar=D}
v(val x = 1) INIT: in: {bar=D} out: {bar=D, x=D}
r(1) -> <v1> INIT: in: {bar=D, x=D} out: {bar=D, x=D}
w(x|<v1>) INIT: in: {bar=D, x=D} out: {bar=D, x=ID}
2 jmp?(L2) INIT: in: {bar=D} out: {bar=D}
d(fun foo() { val a = 2 })
L2 [after local declaration]:
r(object { { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
w(bar|<v2>) INIT: in: {bar=D} out: {bar=ID}
mark("after") INIT: in: {bar=ID} out: {bar=ID}
r(object { init { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
w(bar|<v2>) INIT: in: {bar=D} out: {bar=ID}
mark("after") INIT: in: {bar=ID} out: {bar=ID}
r("after") -> <v3>
L1:
1 <END> INIT: in: {} out: {}
1 <END> INIT: in: {} out: {}
error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
<SINK> USE: in: {} out: {}
=====================
== foo ==
fun foo() {
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt
+1 -1
View File
@@ -1,7 +1,7 @@
fun foo() {
"before"
val bar = object {
{
init {
val x = 1
}
fun foo() {
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.values
+6 -6
View File
@@ -2,7 +2,7 @@
fun foo() {
"before"
val bar = object {
{
init {
val x = 1
}
fun foo() {
@@ -12,11 +12,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW: r(object { { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { init { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW: r(object { init { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val bar = object { init { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
=====================
== foo ==
fun foo() {