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

[FIR] Optimization & checking fix: remove usage of dispatchReceiverValue

Browse Source
This commit is contained in:
simon.ogorodnik
2019-12-25 17:23:44 +03:00
committed by Mikhail Glukhikh
parent 686965c0d3
commit 5e426fdc71
114 changed files with 268 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.fir.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ class A() {
val x = 1
companion object {
val y = <!UNRESOLVED_REFERENCE!>x<!>
val y = x
}
}
compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.fir.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ class Test {
fun test(): Int = 12
companion object {
val a = <!UNRESOLVED_REFERENCE!>test<!>() // Check if resolver will be able to infer type of a variable
val a = test() // Check if resolver will be able to infer type of a variable
}
}
compiler/testData/diagnostics/tests/constructorConsistency/companion.fir.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ class My {
companion object {
val y = <!UNRESOLVED_REFERENCE!>foo<!>()
val y = foo()
val u = bar()
compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.fir.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ public class Z {
class Local {
public inline fun a() {
<!UNRESOLVED_REFERENCE!>privateProperty<!>
privateProperty
}
}
compiler/testData/diagnostics/tests/inner/enumEntries.fir.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
enum class E {
E1 {
override fun foo() = <!UNRESOLVED_REFERENCE!>outerFun<!>() + super.<!UNRESOLVED_REFERENCE!>outerFun<!>()
override fun foo() = outerFun() <!AMBIGUITY!>+<!> super.<!UNRESOLVED_REFERENCE!>outerFun<!>()
},
E2 {
override fun foo() = E1.foo()
compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.fir.kt
Vendored
+2 -2
View File
@@ -12,8 +12,8 @@ class Test {
fun more(): InnerClass {
val b = InnerClass()
val testVal = <!UNRESOLVED_REFERENCE!>inClass<!>
<!UNRESOLVED_REFERENCE!>foo<!>()
val testVal = inClass
foo()
return b
}
compiler/testData/diagnostics/tests/inner/innerErrorForObjects.fir.kt
Vendored
+2 -2
View File
@@ -12,8 +12,8 @@ class Test {
fun more(): InnerClass {
val b = InnerClass()
val testVal = <!UNRESOLVED_REFERENCE!>inClass<!>
<!UNRESOLVED_REFERENCE!>foo<!>()
val testVal = inClass
foo()
return b
}
compiler/testData/diagnostics/tests/inner/localClass.fir.kt
Vendored
+2 -2
View File
@@ -3,10 +3,10 @@ class Outer {
if (outerState > 0) return outerState
class Local {
val localState = <!UNRESOLVED_REFERENCE!>outerState<!>
val localState = outerState
inner class LocalInner {
val o = <!UNRESOLVED_REFERENCE!>outerState<!>
val o = outerState
val l = localState
}
}
compiler/testData/diagnostics/tests/inner/localClassInsideNested.fir.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ class Outer {
class Nested {
fun foo() {
class Local {
val state = <!UNRESOLVED_REFERENCE!>outerState<!>
val state = outerState
}
}
}
compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.fir.kt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ class Outer {
val property = ""
class Nested {
fun f() = <!UNRESOLVED_REFERENCE!>function<!>()
fun g() = <!UNRESOLVED_REFERENCE!>property<!>
fun f() = function()
fun g() = property
fun h() = this@Outer.function()
fun i() = this@Outer.property
}
compiler/testData/diagnostics/tests/inner/outerSuperClassMember.fir.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ open class Base {
class Derived : Base() {
class Nested {
fun bar() = <!UNRESOLVED_REFERENCE!>foo<!>()
fun bar() = foo()
}
}
compiler/testData/diagnostics/tests/regressions/kt5362.fir.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// KT-5362 Compiler crashes on access to extension method from nested class
class Outer {
class Nested{
fun foo(s: String) = s.<!UNRESOLVED_REFERENCE!>extension<!>()
fun foo(s: String) = s.extension()
}
private fun String.extension(): String = this
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.fir.kt
Vendored
+2 -2
View File
@@ -29,8 +29,8 @@ open class A<T> : J() {
fun test() {
foo()
bar()
val a: Int = <!UNRESOLVED_REFERENCE!>baz<!>()
val b: T = <!UNRESOLVED_REFERENCE!>baz<!>()
val a: Int = baz()
val b: T = baz()
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.fir.kt
Vendored
+2 -2
View File
@@ -29,8 +29,8 @@ open class A<T> : J() {
fun test() {
foo()
bar()
val a: Int = <!UNRESOLVED_REFERENCE!>baz<!>()
val b: T = <!UNRESOLVED_REFERENCE!>baz<!>()
val a: Int = baz()
val b: T = baz()
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_after.fir.kt
Vendored
+3 -3
View File
@@ -14,20 +14,20 @@ class A {
init {
foo()
bar()
<!UNRESOLVED_REFERENCE!>baz<!>()
baz()
}
fun test1() {
foo()
bar()
<!UNRESOLVED_REFERENCE!>baz<!>()
baz()
}
object O {
fun test() {
foo()
bar()
<!UNRESOLVED_REFERENCE!>baz<!>()
baz()
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_before.fir.kt
Vendored
+3 -3
View File
@@ -14,20 +14,20 @@ class A {
init {
foo()
bar()
<!UNRESOLVED_REFERENCE!>baz<!>()
baz()
}
fun test1() {
foo()
bar()
<!UNRESOLVED_REFERENCE!>baz<!>()
baz()
}
object O {
fun test() {
foo()
bar()
<!UNRESOLVED_REFERENCE!>baz<!>()
baz()
}
}
compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.fir.kt
Vendored
+6 -6
View File
@@ -5,7 +5,7 @@ open class VeryBase {
open class Base {
protected fun foo() {
bar() // Ok
<!UNRESOLVED_REFERENCE!>baz<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>baz<!>() // Ok
}
inner class Inner {
@@ -13,7 +13,7 @@ open class Base {
foo() // Ok
bar() // Ok
gav() // Ok
<!UNRESOLVED_REFERENCE!>baz<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>baz<!>() // Ok
}
}
@@ -22,7 +22,7 @@ open class Base {
foo() // Ok
bar() // Ok
gav() // Ok
<!UNRESOLVED_REFERENCE!>baz<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>baz<!>() // Ok
}
}
@@ -48,7 +48,7 @@ class Derived : Base() {
foo() // Ok
<!INAPPLICABLE_CANDIDATE!>gav<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>bar<!>()
<!UNRESOLVED_REFERENCE!>baz<!>()
<!INAPPLICABLE_CANDIDATE!>baz<!>()
prop = 0
}
@@ -57,7 +57,7 @@ class Derived : Base() {
foo() // Ok
<!INAPPLICABLE_CANDIDATE!>gav<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>bar<!>()
<!UNRESOLVED_REFERENCE!>baz<!>()
<!INAPPLICABLE_CANDIDATE!>baz<!>()
prop = 0
}
}
@@ -66,7 +66,7 @@ class Derived : Base() {
fun test2() {
<!INAPPLICABLE_CANDIDATE!>gav<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>bar<!>()
<!UNRESOLVED_REFERENCE!>baz<!>()
<!INAPPLICABLE_CANDIDATE!>baz<!>()
prop = 0
}
}
compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.fir.kt
Vendored
+5 -5
View File
@@ -20,8 +20,8 @@ typealias CStr = JHost.Consumer<String>
typealias CStrList = JHost.Consumer<List<String>>
typealias C2<T> = JHost.Consumer2<T, T>
val test1 = <!UNRESOLVED_REFERENCE!>R<!> { }
val test2 = <!UNRESOLVED_REFERENCE!>C<!><String> { s -> <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }
val test3 = <!UNRESOLVED_REFERENCE!>CStr<!> { s -> <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }
val test4 = <!UNRESOLVED_REFERENCE!>CStrList<!> { ss -> <!AMBIGUITY, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (s in ss) { <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }<!> }
val test5 = <!UNRESOLVED_REFERENCE!>C2<!><Int> { a, b -> val x: Int = a <!AMBIGUITY!>+<!> b; println(x)}
val test1 = R { }
val test2 = C<String> { s -> println(s.length) }
val test3 = CStr { s -> <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }
val test4 = CStrList { ss -> <!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (s in ss) { <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }<!> }
val test5 = C2<Int> { a, b -> val x: Int = a <!AMBIGUITY!>+<!> b; println(x)}