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

FIR: Fix resolution for invokes on class qualifiers

Browse Source
This commit is contained in:
Denis Zharkov
2020-03-30 13:04:00 +03:00
parent 10531d2874
commit 9abe669443
24 changed files with 173 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/callResolution/companionInvoke.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
internal class Method<out T : String?>private constructor(val name: String, val signature: T) {
companion object {
operator fun invoke(name: String): Method<String?> = TODO()
}
}
fun foo() {
Method("asd")
}
compiler/fir/analysis-tests/testData/resolve/callResolution/companionInvoke.txt
Vendored
+27
View File
@@ -0,0 +1,27 @@
FILE: companionInvoke.kt
internal final class Method<out T : R|kotlin/String?|> : R|kotlin/Any| {
private constructor<out T : R|kotlin/String?|>(name: R|kotlin/String|, signature: R|T|): R|Method<T>| {
super<R|kotlin/Any|>()
}
public[internal] final val name: R|kotlin/String| = R|<local>/name|
public get(): R|kotlin/String|
public[internal] final val signature: R|T| = R|<local>/signature|
public get(): R|T|
public[internal] final companion object Companion : R|kotlin/Any| {
private constructor(): R|Method.Companion| {
super<R|kotlin/Any|>()
}
public[internal] final operator fun invoke(name: R|kotlin/String|): R|Method<kotlin/String?>| {
^invoke R|kotlin/TODO|()
}
}
}
public final fun foo(): R|kotlin/Unit| {
Q|Method|.R|/Method.Companion.invoke|(String(asd))
}
compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
object Bar {
operator fun invoke(x: String) {}
}
fun foo() {
Bar("asd")
}
compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.txt
Vendored
+13
View File
@@ -0,0 +1,13 @@
FILE: objectInvoke.kt
public final object Bar : R|kotlin/Any| {
private constructor(): R|Bar| {
super<R|kotlin/Any|>()
}
public final operator fun invoke(x: R|kotlin/String|): R|kotlin/Unit| {
}
}
public final fun foo(): R|kotlin/Unit| {
Q|Bar|.R|/Bar.invoke|(String(asd))
}
compiler/fir/analysis-tests/testData/resolve/companionObjectCall.kt
Vendored
+7 -7
View File
@@ -8,13 +8,13 @@ fun case1(a: A?) {
Case1.invoke(it) //resolved to private constructor
<!INAPPLICABLE_CANDIDATE!>Case1<!>(it) //resolved to private constructor
Case1(it) //resolved to private constructor
<!INAPPLICABLE_CANDIDATE!>Case1<!>(A()) //resolved to private constructor
Case1(A()) //resolved to private constructor
}
<!INAPPLICABLE_CANDIDATE!>Case1<!>(A()) //resolved to private constructor
<!INAPPLICABLE_CANDIDATE!>Case1<!>(a = A()) //resolved to private constructor
Case1(A()) //resolved to private constructor
Case1(a = A()) //resolved to private constructor
}
class Case1 private constructor(val a: String) {
@@ -25,8 +25,8 @@ class Case1 private constructor(val a: String) {
// TESTCASE NUMBER: 2
fun case2(a: A){
<!INAPPLICABLE_CANDIDATE!>Case2<!>(a)
<!INAPPLICABLE_CANDIDATE!>Case2<!>(a = a)
Case2(a)
Case2(a = a)
}
class Case2 {
@@ -44,4 +44,4 @@ class Case3 {
companion object {
operator fun invoke(parameterA: A) = "" //(2)
}
}
}
compiler/fir/analysis-tests/testData/resolve/companionObjectCall.txt
Vendored
+9 -9
View File
@@ -6,14 +6,14 @@ FILE: companionObjectCall.kt
}
public final fun case1(a: R|A?|): R|kotlin/Unit| {
lval test: R|kotlin/Nothing?| = R|<local>/a|?.R|kotlin/let|<R|A|, R|kotlin/Nothing|>(<L> = let@fun <anonymous>(it: R|A|): R|kotlin/Nothing| <kind=EXACTLY_ONCE> {
lval test: R|kotlin/String?| = R|<local>/a|?.R|kotlin/let|<R|A|, R|kotlin/String|>(<L> = let@fun <anonymous>(it: R|A|): R|kotlin/String| <kind=EXACTLY_ONCE> {
Q|Case1|.R|/Case1.Companion.invoke|(R|<local>/it|)
<Inapplicable(HIDDEN): [/Case1.Case1]>#(R|<local>/it|)
^ <Inapplicable(HIDDEN): [/Case1.Case1]>#(R|/A.A|())
Q|Case1|.R|/Case1.Companion.invoke|(R|<local>/it|)
^ Q|Case1|.R|/Case1.Companion.invoke|(R|/A.A|())
}
)
<Inapplicable(HIDDEN): [/Case1.Case1]>#(R|/A.A|())
<Inapplicable(HIDDEN): [/Case1.Case1]>#(a = R|/A.A|())
Q|Case1|.R|/Case1.Companion.invoke|(R|/A.A|())
Q|Case1|.R|/Case1.Companion.invoke|(a = R|/A.A|())
}
public final class Case1 : R|kotlin/Any| {
private constructor(a: R|kotlin/String|): R|Case1| {
@@ -36,8 +36,8 @@ FILE: companionObjectCall.kt
}
public final fun case2(a: R|A|): R|kotlin/Unit| {
<Inapplicable(PARAMETER_MAPPING_ERROR): [/Case2.Case2]>#(R|<local>/a|)
<Inapplicable(INAPPLICABLE): [/Case2.Case2]>#(a = R|<local>/a|)
Q|Case2|.R|/Case2.Companion.invoke|(R|<local>/a|)
Q|Case2|.R|/Case2.Companion.invoke|(a = R|<local>/a|)
}
public final class Case2 : R|kotlin/Any| {
public constructor(): R|Case2| {
@@ -57,8 +57,8 @@ FILE: companionObjectCall.kt
}
public final fun case3(a: R|A|): R|kotlin/Unit| {
Q|Case3|.R|/Case3.Companion|.R|/Case3.Companion.invoke|(R|<local>/a|)
Q|Case3|.R|/Case3.Companion|.R|/Case3.Companion.invoke|(parameterA = R|<local>/a|)
Q|Case3.Companion|.R|/Case3.Companion.invoke|(R|<local>/a|)
Q|Case3.Companion|.R|/Case3.Companion.invoke|(parameterA = R|<local>/a|)
}
public final class Case3 : R|kotlin/Any| {
public constructor(): R|Case3| {