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-variables/lexicalScopes/propertyAccessorScope.instructions
Vendored
+23 -23
View File
@@ -3,52 +3,52 @@ fun foo() {
class A {
var a : Int
get() {
return $a
return field
}
set(v: Int) {
$a = v
field = v
}
}
}
---------------------
L0:
1 <START> INIT: in: {} out: {} USE: in: {} out: {}
2 mark({ class A { var a : Int get() { return $a } set(v: Int) { $a = v } } })
v(var a : Int get() { return $a } set(v: Int) { $a = v }) INIT: in: {} out: {a=D}
jmp?(L2) INIT: in: {a=D} out: {a=D}
d(get() { return $a }) USE: in: {a=READ} out: {a=READ}
1 <START> INIT: in: {} out: {}
2 mark({ class A { var a : Int get() { return field } set(v: Int) { field = v } } })
v(var a : Int get() { return field } set(v: Int) { field = v }) INIT: in: {} out: {a=D}
jmp?(L2) INIT: in: {a=D} out: {a=D} USE: in: {field=ONLY_WRITTEN_NEVER_READ, field=READ} out: {field=ONLY_WRITTEN_NEVER_READ, field=READ}
d(get() { return field }) USE: in: {field=READ} out: {field=READ}
L2 [after local declaration]:
jmp?(L5)
d(set(v: Int) { $a = v }) USE: in: {a=ONLY_WRITTEN_NEVER_READ} out: {a=ONLY_WRITTEN_NEVER_READ}
d(set(v: Int) { field = v }) USE: in: {field=ONLY_WRITTEN_NEVER_READ} out: {field=ONLY_WRITTEN_NEVER_READ}
L1:
L5 [after local declaration]:
1 <END> INIT: in: {} out: {}
1 <END> INIT: in: {} out: {}
error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
<SINK> USE: in: {} out: {}
=====================
== get_a ==
get() {
return $a
return field
}
---------------------
L3:
3 <START> INIT: in: {} out: {}
4 mark({ return $a })
magic[IMPLICIT_RECEIVER]($a) -> <v0> USE: in: {a=READ} out: {a=READ}
r($a, a|<v0>) -> <v1> USE: in: {} out: {a=READ}
3 <START> INIT: in: {} out: {}
4 mark({ return field })
magic[IMPLICIT_RECEIVER](field) -> <v0> USE: in: {field=READ} out: {field=READ}
r(field|<v0>) -> <v1> USE: in: {} out: {field=READ}
ret(*|<v1>) L4
L4:
3 <END>
error:
<ERROR>
sink:
<SINK> USE: in: {} out: {}
<SINK> USE: in: {} out: {}
=====================
== set_a ==
set(v: Int) {
$a = v
field = v
}
---------------------
L6:
@@ -56,14 +56,14 @@ L6:
v(v: Int) INIT: in: {} out: {v=D}
magic[FAKE_INITIALIZER](v: Int) -> <v0> INIT: in: {v=D} out: {v=D}
w(v|<v0>) INIT: in: {v=D} out: {v=ID}
4 mark({ $a = v }) INIT: in: {v=ID} out: {v=ID}
magic[IMPLICIT_RECEIVER]($a) -> <v1> USE: in: {a=ONLY_WRITTEN_NEVER_READ, v=READ} out: {a=ONLY_WRITTEN_NEVER_READ, v=READ}
r(v) -> <v2> USE: in: {a=ONLY_WRITTEN_NEVER_READ} out: {a=ONLY_WRITTEN_NEVER_READ, v=READ}
w($a|<v1>, <v2>) INIT: in: {v=ID} out: {a=I, v=ID} USE: in: {} out: {a=ONLY_WRITTEN_NEVER_READ}
4 mark({ field = v }) INIT: in: {v=ID} out: {v=ID}
magic[IMPLICIT_RECEIVER](field) -> <v1> USE: in: {field=ONLY_WRITTEN_NEVER_READ, v=READ} out: {field=ONLY_WRITTEN_NEVER_READ, v=READ}
r(v) -> <v2> USE: in: {field=ONLY_WRITTEN_NEVER_READ} out: {field=ONLY_WRITTEN_NEVER_READ, v=READ}
w(field|<v1>, <v2>) INIT: in: {v=ID} out: {field=I, v=ID} USE: in: {} out: {field=ONLY_WRITTEN_NEVER_READ}
L7:
3 <END> INIT: in: {a=I, v=ID} out: {a=I, v=ID}
3 <END> INIT: in: {field=I, v=ID} out: {field=I, v=ID}
error:
<ERROR> INIT: in: {} out: {}
sink:
<SINK> INIT: in: {a=I, v=ID} out: {a=I, v=ID} USE: in: {} out: {}
<SINK> INIT: in: {field=I, v=ID} out: {field=I, v=ID} USE: in: {} out: {}
=====================
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt
Vendored
+2 -2
View File
@@ -2,10 +2,10 @@ fun foo() {
class A {
var a : Int
get() {
return $a
return field
}
set(v: Int) {
$a = v
field = v
}
}
}
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.values
Vendored
+13 -13
View File
@@ -3,10 +3,10 @@ fun foo() {
class A {
var a : Int
get() {
return $a
return field
}
set(v: Int) {
$a = v
field = v
}
}
}
@@ -14,22 +14,22 @@ fun foo() {
=====================
== get_a ==
get() {
return $a
return field
}
---------------------
<v0>: A NEW: magic[IMPLICIT_RECEIVER]($a) -> <v0>
$a <v1>: Int NEW: r($a, a|<v0>) -> <v1>
return $a !<v2>: *
{ return $a } !<v2>: * COPY
<v0>: A NEW: magic[IMPLICIT_RECEIVER](field) -> <v0>
field <v1>: Int NEW: r(field|<v0>) -> <v1>
return field !<v2>: *
{ return field } !<v2>: * COPY
=====================
== set_a ==
set(v: Int) {
$a = v
field = v
}
---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](v: Int) -> <v0>
<v1>: A NEW: magic[IMPLICIT_RECEIVER]($a) -> <v1>
v <v2>: Int NEW: r(v) -> <v2>
$a = v !<v3>: *
{ $a = v } !<v3>: * COPY
<v0>: Int NEW: magic[FAKE_INITIALIZER](v: Int) -> <v0>
<v1>: A NEW: magic[IMPLICIT_RECEIVER](field) -> <v1>
v <v2>: Int NEW: r(v) -> <v2>
field = v !<v3>: *
{ field = v } !<v3>: * COPY
=====================