FIR: Fix resolution for invokes on class qualifiers
This commit is contained in:
+1
-2
@@ -1,4 +1,3 @@
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
// KJS_WITH_FULL_RUNTIME
|
||||
// !LANGUAGE: +NewInference
|
||||
// WITH_RUNTIME
|
||||
@@ -35,4 +34,4 @@ fun box(): String {
|
||||
if (!test2()) return "fail2"
|
||||
|
||||
return "OK"
|
||||
}
|
||||
}
|
||||
|
||||
Vendored
-1
@@ -1,4 +1,3 @@
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
class A {
|
||||
companion object {
|
||||
operator fun invoke(i: Int) = i
|
||||
|
||||
Vendored
-1
@@ -1,4 +1,3 @@
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
interface B
|
||||
|
||||
operator fun B.invoke(i: Int) = i
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
class A {
|
||||
class Nested {
|
||||
companion object {
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
import A.Nested
|
||||
|
||||
class A {
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
object A
|
||||
|
||||
operator fun A.invoke(i: Int) = i
|
||||
|
||||
fun box() = if (A(42) == 42) "OK" else "fail"
|
||||
fun box() = if (A(42) == 42) "OK" else "fail"
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
object A {
|
||||
operator fun invoke(i: Int) = i
|
||||
}
|
||||
|
||||
fun box() = if (A(42) == 42) "OK" else "fail"
|
||||
fun box() = if (A(42) == 42) "OK" else "fail"
|
||||
|
||||
+1
-2
@@ -1,4 +1,3 @@
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
class TestClass {
|
||||
companion object {
|
||||
inline operator fun <T> invoke(task: () -> T) = task()
|
||||
@@ -12,4 +11,4 @@ fun box(): String {
|
||||
val ok = "OK"
|
||||
|
||||
val x = TestClass { return ok }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
// SKIP_TXT
|
||||
// !DIAGNOSTICS: -UNUSED_PARAMETER
|
||||
// !LANGUAGE: +NewInference
|
||||
|
||||
fun main() {
|
||||
Configuration().commands {
|
||||
<!INAPPLICABLE_CANDIDATE!>Command1<!> { <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>someService<!>::execute<!> } // Overload resolution ambiguity. All these functions match.
|
||||
<!INAPPLICABLE_CANDIDATE!>Command2<!> { <!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>someService<!>::execute<!> } // Overload resolution ambiguity. All these functions match.
|
||||
<!INAPPLICABLE_CANDIDATE!>Command1<!> { { <!UNRESOLVED_REFERENCE!>someService<!>.<!UNRESOLVED_REFERENCE!>execute<!>(<!UNRESOLVED_REFERENCE!>it<!>) } } // fine
|
||||
<!INAPPLICABLE_CANDIDATE!>Command2<!> { { <!UNRESOLVED_REFERENCE!>someService<!>.<!UNRESOLVED_REFERENCE!>execute<!>(<!UNRESOLVED_REFERENCE!>it<!>) } } // fine
|
||||
}
|
||||
}
|
||||
interface Command
|
||||
interface CommandFactory<TCommand : Command>
|
||||
class Command1 : Command {
|
||||
companion object : CommandFactory<Command1>
|
||||
}
|
||||
class Command2 : Command {
|
||||
companion object : CommandFactory<Command2>
|
||||
}
|
||||
class Configuration {
|
||||
val commands = Commands()
|
||||
inline fun commands(configure: Commands.() -> Unit) {
|
||||
commands.configure()
|
||||
}
|
||||
class Commands {
|
||||
operator fun <TCommand : Command> CommandFactory<TCommand>.invoke(
|
||||
handler: Transaction.() -> ((command: TCommand) -> Unit)
|
||||
) {
|
||||
}
|
||||
}
|
||||
}
|
||||
interface Transaction {
|
||||
val someService: SomeService
|
||||
}
|
||||
interface SomeService {
|
||||
fun execute(command: Command1)
|
||||
fun execute(command: Command2)
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
// FIR_IDENTICAL
|
||||
// SKIP_TXT
|
||||
// !DIAGNOSTICS: -UNUSED_PARAMETER
|
||||
// !LANGUAGE: +NewInference
|
||||
|
||||
+5
-5
@@ -9,9 +9,9 @@ class TestClass {
|
||||
}
|
||||
|
||||
fun test(s: String): String {
|
||||
val a = <!INAPPLICABLE_CANDIDATE!>TestClass<!> { "K" }
|
||||
a <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
|
||||
val a = TestClass { "K" }
|
||||
a checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
|
||||
|
||||
val b = <!INAPPLICABLE_CANDIDATE!>TestClass<!> { return s }
|
||||
b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Nothing>() }
|
||||
}
|
||||
val b = TestClass { return s }
|
||||
b checkType { <!UNRESOLVED_REFERENCE!>_<!><Nothing>() }
|
||||
}
|
||||
|
||||
@@ -20,4 +20,4 @@ val a = A
|
||||
val b = B
|
||||
val c = C
|
||||
val d = D
|
||||
val e = <!INAPPLICABLE_CANDIDATE!>E<!>(42)
|
||||
val e = E(42)
|
||||
|
||||
@@ -83,7 +83,7 @@ FILE fqName:<root> fileName:/objectAsCallable.kt
|
||||
FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]
|
||||
EXPRESSION_BODY
|
||||
CALL 'public final fun invoke (i: kotlin.Int): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
|
||||
$receiver: ERROR_CALL 'Unresolved reference: R|/A|' type=IrErrorType
|
||||
$receiver: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.A
|
||||
i: CONST Int type=kotlin.Int value=42
|
||||
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Int
|
||||
correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val]
|
||||
|
||||
Reference in New Issue
Block a user