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/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() {