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

Get rid of FIELD_IDENTIFIER at syntax level, two errors dropped, a set of tests fixed / deleted #KT-9539 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-10-20 13:55:37 +03:00
parent 8ea0501a30
commit d6988ad69e
97 changed files with 177 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.instructions
Vendored
+11 -11
View File
@@ -4,14 +4,14 @@ class AnonymousInitializers() {
val i: Int
init {
$i = 12
i = 12
}
val j: Int
get() = 20
init {
$i = 13
i = 13
}
}
---------------------
@@ -21,19 +21,19 @@ L0:
r(34) -> <v0>
w(k|<v0>)
v(val i: Int)
2 mark({ $i = 12 })
magic[IMPLICIT_RECEIVER]($i) -> <v1>
2 mark({ i = 12 })
magic[IMPLICIT_RECEIVER](i) -> <v1>
r(12) -> <v2>
w($i|<v1>, <v2>)
w(i|<v1>, <v2>)
1 v(val j: Int get() = 20)
2 mark({ $i = 13 })
magic[IMPLICIT_RECEIVER]($i) -> <v4>
2 mark({ i = 13 })
magic[IMPLICIT_RECEIVER](i) -> <v4>
r(13) -> <v5>
w($i|<v4>, <v5>)
w(i|<v4>, <v5>)
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/declarations/classesAndObjects/AnonymousInitializers.kt
Vendored
+2 -2
View File
@@ -3,13 +3,13 @@ class AnonymousInitializers() {
val i: Int
init {
$i = 12
i = 12
}
val j: Int
get() = 20
init {
$i = 13
i = 13
}
}
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.values
Vendored
+11 -11
View File
@@ -4,24 +4,24 @@ class AnonymousInitializers() {
val i: Int
init {
$i = 12
i = 12
}
val j: Int
get() = 20
init {
$i = 13
i = 13
}
}
---------------------
<v1>: AnonymousInitializers NEW: magic[IMPLICIT_RECEIVER]($i) -> <v1>
<v4>: AnonymousInitializers NEW: magic[IMPLICIT_RECEIVER]($i) -> <v4>
34 <v0>: Int NEW: r(34) -> <v0>
12 <v2>: Int NEW: r(12) -> <v2>
$i = 12 !<v3>: *
{ $i = 12 } !<v3>: * COPY
13 <v5>: Int NEW: r(13) -> <v5>
$i = 13 !<v6>: *
{ $i = 13 } !<v6>: * COPY
<v1>: AnonymousInitializers NEW: magic[IMPLICIT_RECEIVER](i) -> <v1>
<v4>: AnonymousInitializers NEW: magic[IMPLICIT_RECEIVER](i) -> <v4>
34 <v0>: Int NEW: r(34) -> <v0>
12 <v2>: Int NEW: r(12) -> <v2>
i = 12 !<v3>: *
{ i = 12 } !<v3>: * COPY
13 <v5>: Int NEW: r(13) -> <v5>
i = 13 !<v6>: *
{ i = 13 } !<v6>: * COPY
=====================
compiler/testData/cfg/declarations/local/LocalDeclarations.instructions
Vendored
+47 -47
View File
@@ -6,7 +6,7 @@ class C() {
val x : Int
init {
$x = 1
x = 1
}
@@ -51,51 +51,51 @@ fun test1() {
val a = object {
val x : Int
init {
$x = 1
x = 1
}
}
}
---------------------
L0:
1 <START>
2 mark({ val a = object { val x : Int init { $x = 1 } } })
v(val a = object { val x : Int init { $x = 1 } })
mark(object { val x : Int init { $x = 1 } })
2 mark({ val a = object { val x : Int init { x = 1 } } })
v(val a = object { val x : Int init { x = 1 } })
mark(object { val x : Int init { x = 1 } })
v(val x : Int)
3 mark({ $x = 1 })
magic[IMPLICIT_RECEIVER]($x) -> <v0>
3 mark({ x = 1 })
magic[IMPLICIT_RECEIVER](x) -> <v0>
r(1) -> <v1>
w($x|<v0>, <v1>)
2 r(object { val x : Int init { $x = 1 } }) -> <v3>
w(x|<v0>, <v1>)
2 r(object { val x : Int init { x = 1 } }) -> <v3>
w(a|<v3>)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== O ==
object O {
val x : Int
init {
$x = 1
x = 1
}
}
---------------------
L0:
1 <START>
v(val x : Int)
2 mark({ $x = 1 })
magic[IMPLICIT_RECEIVER]($x) -> <v0>
2 mark({ x = 1 })
magic[IMPLICIT_RECEIVER](x) -> <v0>
r(1) -> <v1>
w($x|<v0>, <v1>)
w(x|<v0>, <v1>)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== test2 ==
fun test2() {
@@ -177,7 +177,7 @@ fun test4() {
val x : Int
val y : Int
init {
$x = 1
x = 1
}
fun ggg() {
y = 10
@@ -187,26 +187,26 @@ fun test4() {
---------------------
L0:
1 <START>
2 mark({ val a = object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } } })
v(val a = object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } })
mark(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } })
2 mark({ val a = object { val x : Int val y : Int init { x = 1 } fun ggg() { y = 10 } } })
v(val a = object { val x : Int val y : Int init { x = 1 } fun ggg() { y = 10 } })
mark(object { val x : Int val y : Int init { x = 1 } fun ggg() { y = 10 } })
v(val x : Int)
v(val y : Int)
3 mark({ $x = 1 })
magic[IMPLICIT_RECEIVER]($x) -> <v0>
3 mark({ x = 1 })
magic[IMPLICIT_RECEIVER](x) -> <v0>
r(1) -> <v1>
w($x|<v0>, <v1>)
2 jmp?(L2) NEXT:[r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3>, d(fun ggg() { y = 10 })]
d(fun ggg() { y = 10 }) NEXT:[<SINK>]
w(x|<v0>, <v1>)
2 jmp?(L2) NEXT:[r(object { val x : Int val y : Int init { x = 1 } fun ggg() { y = 10 } }) -> <v3>, d(fun ggg() { y = 10 })]
d(fun ggg() { y = 10 }) NEXT:[<SINK>]
L2 [after local declaration]:
r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3> PREV:[jmp?(L2)]
r(object { val x : Int val y : Int init { x = 1 } fun ggg() { y = 10 } }) -> <v3> PREV:[jmp?(L2)]
w(a|<v3>)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 })]
<SINK> PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 })]
=====================
== ggg ==
fun ggg() {
@@ -231,7 +231,7 @@ fun test5() {
val a = object {
var x = 1
init {
$x = 2
x = 2
}
fun foo() {
x = 3
@@ -244,30 +244,30 @@ fun test5() {
---------------------
L0:
1 <START>
2 mark({ val a = object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } })
v(val a = object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
mark(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
2 mark({ val a = object { var x = 1 init { x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } })
v(val a = object { var x = 1 init { x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
mark(object { var x = 1 init { x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
v(var x = 1)
r(1) -> <v0>
w(x|<v0>)
3 mark({ $x = 2 })
magic[IMPLICIT_RECEIVER]($x) -> <v1>
3 mark({ x = 2 })
magic[IMPLICIT_RECEIVER](x) -> <v1>
r(2) -> <v2>
w($x|<v1>, <v2>)
2 jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })]
d(fun foo() { x = 3 }) NEXT:[<SINK>]
w(x|<v1>, <v2>)
2 jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })]
d(fun foo() { x = 3 }) NEXT:[<SINK>]
L2 [after local declaration]:
jmp?(L5) NEXT:[r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>, d(fun bar() { x = 4 })] PREV:[jmp?(L2)]
d(fun bar() { x = 4 }) NEXT:[<SINK>]
jmp?(L5) NEXT:[r(object { var x = 1 init { x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>, d(fun bar() { x = 4 })] PREV:[jmp?(L2)]
d(fun bar() { x = 4 }) NEXT:[<SINK>]
L5 [after local declaration]:
r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4> PREV:[jmp?(L5)]
r(object { var x = 1 init { x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4> PREV:[jmp?(L5)]
w(a|<v4>)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }), d(fun bar() { x = 4 })]
<SINK> PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }), d(fun bar() { x = 4 })]
=====================
== foo ==
fun foo() {
compiler/testData/cfg/declarations/local/LocalDeclarations.kt
Vendored
+5 -5
View File
@@ -5,7 +5,7 @@ class C() {
val x : Int
init {
$x = 1
x = 1
}
@@ -22,7 +22,7 @@ fun test1() {
val a = object {
val x : Int
init {
$x = 1
x = 1
}
}
}
@@ -30,7 +30,7 @@ fun test1() {
object O {
val x : Int
init {
$x = 1
x = 1
}
}
@@ -53,7 +53,7 @@ fun test4() {
val x : Int
val y : Int
init {
$x = 1
x = 1
}
fun ggg() {
y = 10
@@ -65,7 +65,7 @@ fun test5() {
val a = object {
var x = 1
init {
$x = 2
x = 2
}
fun foo() {
x = 3
compiler/testData/cfg/declarations/local/LocalDeclarations.values
Vendored
+25 -25
View File
@@ -6,7 +6,7 @@ class C() {
val x : Int
init {
$x = 1
x = 1
}
@@ -29,29 +29,29 @@ fun test1() {
val a = object {
val x : Int
init {
$x = 1
x = 1
}
}
}
---------------------
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY
object { val x : Int init { $x = 1 } } <v3>: <no name provided> NEW: r(object { val x : Int init { $x = 1 } }) -> <v3>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
x = 1 !<v2>: *
{ x = 1 } !<v2>: * COPY
object { val x : Int init { x = 1 } } <v3>: <no name provided> NEW: r(object { val x : Int init { x = 1 } }) -> <v3>
=====================
== O ==
object O {
val x : Int
init {
$x = 1
x = 1
}
}
---------------------
<v0>: O NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY
<v0>: O NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
x = 1 !<v2>: *
{ x = 1 } !<v2>: * COPY
=====================
== test2 ==
fun test2() {
@@ -93,7 +93,7 @@ fun test4() {
val x : Int
val y : Int
init {
$x = 1
x = 1
}
fun ggg() {
y = 10
@@ -101,11 +101,11 @@ fun test4() {
}
}
---------------------
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY
object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } } <v3>: <no name provided> NEW: r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
x = 1 !<v2>: *
{ x = 1 } !<v2>: * COPY
object { val x : Int val y : Int init { x = 1 } fun ggg() { y = 10 } } <v3>: <no name provided> NEW: r(object { val x : Int val y : Int init { x = 1 } fun ggg() { y = 10 } }) -> <v3>
=====================
== ggg ==
fun ggg() {
@@ -122,7 +122,7 @@ fun test5() {
val a = object {
var x = 1
init {
$x = 2
x = 2
}
fun foo() {
x = 3
@@ -133,12 +133,12 @@ fun test5() {
}
}
---------------------
<v1>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
$x = 2 !<v3>: *
{ $x = 2 } !<v3>: * COPY
object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v4>: <no name provided> NEW: r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>
<v1>: <no name provided> NEW: magic[IMPLICIT_RECEIVER](x) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
x = 2 !<v3>: *
{ x = 2 } !<v3>: * COPY
object { var x = 1 init { x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v4>: <no name provided> NEW: r(object { var x = 1 init { x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>
=====================
== foo ==
fun foo() {
compiler/testData/cfg/declarations/properties/backingFieldAccess.instructions
Vendored
-23
View File
@@ -1,23 +0,0 @@
== C ==
class C {
val a: Int
get() = 1
init {
$a
}
}
---------------------
L0:
1 <START>
v(val a: Int get() = 1)
2 mark({ $a })
magic[IMPLICIT_RECEIVER]($a) -> <v0>
r($a, a|<v0>) -> <v1>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/declarations/properties/backingFieldAccess.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
class C {
val a: Int
get() = 1
init {
$a
}
}
compiler/testData/cfg/declarations/properties/backingFieldAccess.values
Vendored
-14
View File
@@ -1,14 +0,0 @@
== C ==
class C {
val a: Int
get() = 1
init {
$a
}
}
---------------------
<v0>: C NEW: magic[IMPLICIT_RECEIVER]($a) -> <v0>
$a <v1>: * NEW: r($a, a|<v0>) -> <v1>
{ $a } <v1>: * COPY
=====================
compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.instructions
Vendored
-36
View File
@@ -1,36 +0,0 @@
== Bar ==
abstract class Bar {
abstract var bar : String
fun foo() = "foo" + this.$bar
}
---------------------
L0:
1 <START>
v(abstract var bar : String)
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== foo ==
fun foo() = "foo" + this.$bar
---------------------
L0:
1 <START>
mark("foo")
r("foo") -> <v0>
mark(this.$bar)
r(this, <this>) -> <v1>
r($bar, bar|<v1>) -> <v2>
mark("foo" + this.$bar)
call("foo" + this.$bar, plus|<v0>, <v2>) -> <v3>
ret(*|<v3>) L1
L1:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
abstract class Bar {
abstract var bar : String
fun foo() = "foo" + this.$bar
}
compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.values
Vendored
-17
View File
@@ -1,17 +0,0 @@
== Bar ==
abstract class Bar {
abstract var bar : String
fun foo() = "foo" + this.$bar
}
---------------------
=====================
== foo ==
fun foo() = "foo" + this.$bar
---------------------
"foo" <v0>: String NEW: r("foo") -> <v0>
this <v1>: {<: Bar} COPY
this <v1>: {<: Bar} NEW: r(this, <this>) -> <v1>
$bar <v2>: * NEW: r($bar, bar|<v1>) -> <v2>
this.$bar <v2>: * COPY
"foo" + this.$bar <v3>: String NEW: call("foo" + this.$bar, plus|<v0>, <v2>) -> <v3>
=====================