[FIR2IR] Properly generate GetObject expression for callable reference on companion object
^KT-55909 Fixed
This commit is contained in:
committed by
Space Team
parent
80b48eed0b
commit
075e025452
+32
-1
@@ -13,13 +13,16 @@ import org.jetbrains.kotlin.fir.dispatchReceiverClassLookupTagOrNull
|
|||||||
import org.jetbrains.kotlin.fir.expressions.*
|
import org.jetbrains.kotlin.fir.expressions.*
|
||||||
import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationCall
|
import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationCall
|
||||||
import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
|
import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
|
||||||
|
import org.jetbrains.kotlin.fir.getContainingClassLookupTag
|
||||||
import org.jetbrains.kotlin.fir.references.*
|
import org.jetbrains.kotlin.fir.references.*
|
||||||
import org.jetbrains.kotlin.fir.references.builder.buildResolvedNamedReference
|
import org.jetbrains.kotlin.fir.references.builder.buildResolvedNamedReference
|
||||||
import org.jetbrains.kotlin.fir.render
|
import org.jetbrains.kotlin.fir.render
|
||||||
import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticFunctionSymbol
|
import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticFunctionSymbol
|
||||||
|
import org.jetbrains.kotlin.fir.resolve.defaultType
|
||||||
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
|
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
|
||||||
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
|
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
|
||||||
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutorByMap
|
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutorByMap
|
||||||
|
import org.jetbrains.kotlin.fir.resolve.toFirRegularClassSymbol
|
||||||
import org.jetbrains.kotlin.fir.resolve.toSymbol
|
import org.jetbrains.kotlin.fir.resolve.toSymbol
|
||||||
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.approximateDeclarationType
|
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.approximateDeclarationType
|
||||||
import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
|
import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
|
||||||
@@ -703,7 +706,35 @@ class CallAndReferenceGenerator(
|
|||||||
val resolvedReference = callableReferenceAccess.calleeReference as FirResolvedNamedReference
|
val resolvedReference = callableReferenceAccess.calleeReference as FirResolvedNamedReference
|
||||||
val firCallableSymbol = resolvedReference.resolvedSymbol as FirCallableSymbol<*>
|
val firCallableSymbol = resolvedReference.resolvedSymbol as FirCallableSymbol<*>
|
||||||
// Make sure the reference indeed refers to a member of that companion
|
// Make sure the reference indeed refers to a member of that companion
|
||||||
if (firCallableSymbol.dispatchReceiverClassLookupTagOrNull() != classSymbol.toLookupTag()) {
|
|
||||||
|
val dispatchReceiverClassLookupTag = firCallableSymbol.dispatchReceiverClassLookupTagOrNull() ?: return null
|
||||||
|
val callableIsDefinitelyNotMemberOfCompanion = with(session.typeContext) {
|
||||||
|
!classSymbol.defaultType().anySuperTypeConstructor { it.typeConstructor() == dispatchReceiverClassLookupTag }
|
||||||
|
}
|
||||||
|
if (callableIsDefinitelyNotMemberOfCompanion) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* This check is supposed to distinguish cases when both companion and containing class have this function
|
||||||
|
*
|
||||||
|
* open class Base {
|
||||||
|
* fun foo() {}
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* class Some : Base() {
|
||||||
|
* companion object : Base() {
|
||||||
|
* fun bar()
|
||||||
|
* }
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* Some::foo // reference to Some.foo
|
||||||
|
* Some::bar // reference to Some.Companion.bar
|
||||||
|
*/
|
||||||
|
val containingClass = classSymbol.getContainingClassLookupTag()?.toFirRegularClassSymbol(session) ?: return null
|
||||||
|
val callableIsDefinitelyMemberOfOuterClass = with(session.typeContext) {
|
||||||
|
containingClass.defaultType().anySuperTypeConstructor { it.typeConstructor() == dispatchReceiverClassLookupTag }
|
||||||
|
}
|
||||||
|
if (callableIsDefinitelyMemberOfOuterClass) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -4656,6 +4656,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
|
|||||||
runTest("compiler/testData/codegen/box/callableReference/serializability/noReflect.kt");
|
runTest("compiler/testData/codegen/box/callableReference/serializability/noReflect.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("reflectedIsNotSerialized.kt")
|
@TestMetadata("reflectedIsNotSerialized.kt")
|
||||||
public void testReflectedIsNotSerialized() throws Exception {
|
public void testReflectedIsNotSerialized() throws Exception {
|
||||||
|
|||||||
+156
@@ -0,0 +1,156 @@
|
|||||||
|
FILE fqName:<root> fileName:/referenceToCompanionFunction.kt
|
||||||
|
CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
|
||||||
|
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base
|
||||||
|
CONSTRUCTOR visibility:public <> () returnType:<root>.Base [primary]
|
||||||
|
BLOCK_BODY
|
||||||
|
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
|
||||||
|
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
|
||||||
|
FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:<root>.Base
|
||||||
|
BLOCK_BODY
|
||||||
|
RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.Base'
|
||||||
|
CONST String type=kotlin.String value="A"
|
||||||
|
FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.String
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:<root>.Base
|
||||||
|
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
|
||||||
|
overridden:
|
||||||
|
public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
|
||||||
|
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
|
||||||
|
overridden:
|
||||||
|
public open fun hashCode (): kotlin.Int declared in kotlin.Any
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
|
||||||
|
overridden:
|
||||||
|
public open fun toString (): kotlin.String declared in kotlin.Any
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
CLASS CLASS name:Some modality:FINAL visibility:public superTypes:[kotlin.Any]
|
||||||
|
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Some
|
||||||
|
CONSTRUCTOR visibility:public <> () returnType:<root>.Some [primary]
|
||||||
|
BLOCK_BODY
|
||||||
|
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
|
||||||
|
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Some modality:FINAL visibility:public superTypes:[kotlin.Any]'
|
||||||
|
CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[<root>.Base]
|
||||||
|
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Some.Companion
|
||||||
|
CONSTRUCTOR visibility:private <> () returnType:<root>.Some.Companion [primary]
|
||||||
|
BLOCK_BODY
|
||||||
|
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
|
||||||
|
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[<root>.Base]'
|
||||||
|
FUN name:bar visibility:public modality:OPEN <> ($this:<root>.Some.Companion) returnType:kotlin.String
|
||||||
|
overridden:
|
||||||
|
public abstract fun bar (): kotlin.String declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:<root>.Some.Companion
|
||||||
|
BLOCK_BODY
|
||||||
|
RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.String declared in <root>.Some.Companion'
|
||||||
|
CONST String type=kotlin.String value="B"
|
||||||
|
FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String [fake_override]
|
||||||
|
overridden:
|
||||||
|
public final fun foo (): kotlin.String declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:<root>.Base
|
||||||
|
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
|
||||||
|
overridden:
|
||||||
|
public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
|
||||||
|
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
|
||||||
|
overridden:
|
||||||
|
public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
|
||||||
|
overridden:
|
||||||
|
public open fun toString (): kotlin.String [fake_override] declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
|
||||||
|
overridden:
|
||||||
|
public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
|
||||||
|
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
|
||||||
|
overridden:
|
||||||
|
public open fun hashCode (): kotlin.Int declared in kotlin.Any
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
|
||||||
|
overridden:
|
||||||
|
public open fun toString (): kotlin.String declared in kotlin.Any
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
CLASS OBJECT name:Singleton modality:FINAL visibility:public superTypes:[<root>.Base]
|
||||||
|
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Singleton
|
||||||
|
CONSTRUCTOR visibility:private <> () returnType:<root>.Singleton [primary]
|
||||||
|
BLOCK_BODY
|
||||||
|
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
|
||||||
|
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Singleton modality:FINAL visibility:public superTypes:[<root>.Base]'
|
||||||
|
FUN name:bar visibility:public modality:OPEN <> ($this:<root>.Singleton) returnType:kotlin.String
|
||||||
|
overridden:
|
||||||
|
public abstract fun bar (): kotlin.String declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:<root>.Singleton
|
||||||
|
BLOCK_BODY
|
||||||
|
RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.String declared in <root>.Singleton'
|
||||||
|
CONST String type=kotlin.String value="C"
|
||||||
|
FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String [fake_override]
|
||||||
|
overridden:
|
||||||
|
public final fun foo (): kotlin.String declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:<root>.Base
|
||||||
|
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
|
||||||
|
overridden:
|
||||||
|
public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
|
||||||
|
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
|
||||||
|
overridden:
|
||||||
|
public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
|
||||||
|
overridden:
|
||||||
|
public open fun toString (): kotlin.String [fake_override] declared in <root>.Base
|
||||||
|
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||||
|
FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
|
||||||
|
BLOCK_BODY
|
||||||
|
VAR name:ref1 type:kotlin.reflect.KFunction0<kotlin.String> [val]
|
||||||
|
FUNCTION_REFERENCE 'public final fun foo (): kotlin.String [fake_override] declared in <root>.Some.Companion' type=kotlin.reflect.KFunction0<kotlin.String> origin=null reflectionTarget=<same>
|
||||||
|
$this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[<root>.Base]' type=<root>.Some.Companion
|
||||||
|
VAR name:ref2 type:kotlin.reflect.KFunction0<kotlin.String> [val]
|
||||||
|
FUNCTION_REFERENCE 'public open fun bar (): kotlin.String declared in <root>.Some.Companion' type=kotlin.reflect.KFunction0<kotlin.String> origin=null reflectionTarget=<same>
|
||||||
|
$this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[<root>.Base]' type=<root>.Some.Companion
|
||||||
|
VAR name:ref3 type:kotlin.reflect.KFunction0<kotlin.String> [val]
|
||||||
|
FUNCTION_REFERENCE 'public final fun foo (): kotlin.String [fake_override] declared in <root>.Some.Companion' type=kotlin.reflect.KFunction0<kotlin.String> origin=null reflectionTarget=<same>
|
||||||
|
$this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[<root>.Base]' type=<root>.Some.Companion
|
||||||
|
VAR name:ref4 type:kotlin.reflect.KFunction0<kotlin.String> [val]
|
||||||
|
FUNCTION_REFERENCE 'public open fun bar (): kotlin.String declared in <root>.Some.Companion' type=kotlin.reflect.KFunction0<kotlin.String> origin=null reflectionTarget=<same>
|
||||||
|
$this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[<root>.Base]' type=<root>.Some.Companion
|
||||||
|
VAR name:ref5 type:kotlin.reflect.KFunction0<kotlin.String> [val]
|
||||||
|
FUNCTION_REFERENCE 'public final fun foo (): kotlin.String [fake_override] declared in <root>.Singleton' type=kotlin.reflect.KFunction0<kotlin.String> origin=null reflectionTarget=<same>
|
||||||
|
$this: GET_OBJECT 'CLASS OBJECT name:Singleton modality:FINAL visibility:public superTypes:[<root>.Base]' type=<root>.Singleton
|
||||||
|
VAR name:ref6 type:kotlin.reflect.KFunction0<kotlin.String> [val]
|
||||||
|
FUNCTION_REFERENCE 'public open fun bar (): kotlin.String declared in <root>.Singleton' type=kotlin.reflect.KFunction0<kotlin.String> origin=null reflectionTarget=<same>
|
||||||
|
$this: GET_OBJECT 'CLASS OBJECT name:Singleton modality:FINAL visibility:public superTypes:[<root>.Base]' type=<root>.Singleton
|
||||||
|
VAR name:result type:kotlin.String [val]
|
||||||
|
CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
|
||||||
|
$this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
|
||||||
|
$this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
|
||||||
|
$this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
|
||||||
|
$this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
|
||||||
|
$this: CALL 'public abstract fun invoke (): R of kotlin.reflect.KFunction0 [operator] declared in kotlin.reflect.KFunction0' type=kotlin.String origin=INVOKE
|
||||||
|
$this: GET_VAR 'val ref1: kotlin.reflect.KFunction0<kotlin.String> [val] declared in <root>.box' type=kotlin.reflect.KFunction0<kotlin.String> origin=VARIABLE_AS_FUNCTION
|
||||||
|
other: CALL 'public abstract fun invoke (): R of kotlin.reflect.KFunction0 [operator] declared in kotlin.reflect.KFunction0' type=kotlin.String origin=INVOKE
|
||||||
|
$this: GET_VAR 'val ref2: kotlin.reflect.KFunction0<kotlin.String> [val] declared in <root>.box' type=kotlin.reflect.KFunction0<kotlin.String> origin=VARIABLE_AS_FUNCTION
|
||||||
|
other: CALL 'public abstract fun invoke (): R of kotlin.reflect.KFunction0 [operator] declared in kotlin.reflect.KFunction0' type=kotlin.String origin=INVOKE
|
||||||
|
$this: GET_VAR 'val ref3: kotlin.reflect.KFunction0<kotlin.String> [val] declared in <root>.box' type=kotlin.reflect.KFunction0<kotlin.String> origin=VARIABLE_AS_FUNCTION
|
||||||
|
other: CALL 'public abstract fun invoke (): R of kotlin.reflect.KFunction0 [operator] declared in kotlin.reflect.KFunction0' type=kotlin.String origin=INVOKE
|
||||||
|
$this: GET_VAR 'val ref4: kotlin.reflect.KFunction0<kotlin.String> [val] declared in <root>.box' type=kotlin.reflect.KFunction0<kotlin.String> origin=VARIABLE_AS_FUNCTION
|
||||||
|
other: CALL 'public abstract fun invoke (): R of kotlin.reflect.KFunction0 [operator] declared in kotlin.reflect.KFunction0' type=kotlin.String origin=INVOKE
|
||||||
|
$this: GET_VAR 'val ref5: kotlin.reflect.KFunction0<kotlin.String> [val] declared in <root>.box' type=kotlin.reflect.KFunction0<kotlin.String> origin=VARIABLE_AS_FUNCTION
|
||||||
|
other: CALL 'public abstract fun invoke (): R of kotlin.reflect.KFunction0 [operator] declared in kotlin.reflect.KFunction0' type=kotlin.String origin=INVOKE
|
||||||
|
$this: GET_VAR 'val ref6: kotlin.reflect.KFunction0<kotlin.String> [val] declared in <root>.box' type=kotlin.reflect.KFunction0<kotlin.String> origin=VARIABLE_AS_FUNCTION
|
||||||
|
RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
|
||||||
|
WHEN type=kotlin.String origin=IF
|
||||||
|
BRANCH
|
||||||
|
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
|
||||||
|
arg0: GET_VAR 'val result: kotlin.String [val] declared in <root>.box' type=kotlin.String origin=null
|
||||||
|
arg1: CONST String type=kotlin.String value="ABABAC"
|
||||||
|
then: CONST String type=kotlin.String value="OK"
|
||||||
|
BRANCH
|
||||||
|
if: CONST Boolean type=kotlin.Boolean value=true
|
||||||
|
then: STRING_CONCATENATION type=kotlin.String
|
||||||
|
CONST String type=kotlin.String value="Fail: "
|
||||||
|
GET_VAR 'val result: kotlin.String [val] declared in <root>.box' type=kotlin.String origin=null
|
||||||
Vendored
+33
@@ -0,0 +1,33 @@
|
|||||||
|
// IGNORE_BACKEND_K1: ANY
|
||||||
|
// FE 1.0 incorrectly resolves reference `Some::foo` (KT-45315)
|
||||||
|
// DONT_TARGET_EXACT_BACKEND: WASM
|
||||||
|
// WASM_MUTE_REASON: Wasm box test does not support disabling only K1 mode with IGNORE_BACKEND directive
|
||||||
|
// ISSUE: KT-55909
|
||||||
|
// DUMP_IR
|
||||||
|
|
||||||
|
abstract class Base {
|
||||||
|
fun foo(): String = "A"
|
||||||
|
abstract fun bar(): String
|
||||||
|
}
|
||||||
|
|
||||||
|
class Some {
|
||||||
|
companion object : Base() {
|
||||||
|
override fun bar(): String = "B"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// For sanity check
|
||||||
|
object Singleton : Base() {
|
||||||
|
override fun bar(): String = "C"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
val ref1 = Some::foo
|
||||||
|
val ref2 = Some::bar
|
||||||
|
val ref3 = Some.Companion::foo
|
||||||
|
val ref4 = Some.Companion::bar
|
||||||
|
val ref5 = Singleton::foo
|
||||||
|
val ref6 = Singleton::bar
|
||||||
|
val result = ref1() + ref2() + ref3() + ref4() + ref5() + ref6()
|
||||||
|
return if (result == "ABABAC") "OK" else "Fail: $result"
|
||||||
|
}
|
||||||
+6
@@ -4530,6 +4530,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
|||||||
runTest("compiler/testData/codegen/box/callableReference/serializability/noReflect.kt");
|
runTest("compiler/testData/codegen/box/callableReference/serializability/noReflect.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("reflectedIsNotSerialized.kt")
|
@TestMetadata("reflectedIsNotSerialized.kt")
|
||||||
public void testReflectedIsNotSerialized() throws Exception {
|
public void testReflectedIsNotSerialized() throws Exception {
|
||||||
|
|||||||
+6
@@ -4656,6 +4656,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
|
|||||||
runTest("compiler/testData/codegen/box/callableReference/serializability/noReflect.kt");
|
runTest("compiler/testData/codegen/box/callableReference/serializability/noReflect.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("reflectedIsNotSerialized.kt")
|
@TestMetadata("reflectedIsNotSerialized.kt")
|
||||||
public void testReflectedIsNotSerialized() throws Exception {
|
public void testReflectedIsNotSerialized() throws Exception {
|
||||||
|
|||||||
+5
@@ -3952,6 +3952,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
|
|||||||
runTest("compiler/testData/codegen/box/callableReference/serializability/noReflect.kt");
|
runTest("compiler/testData/codegen/box/callableReference/serializability/noReflect.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("reflectedIsNotSerialized.kt")
|
@TestMetadata("reflectedIsNotSerialized.kt")
|
||||||
public void testReflectedIsNotSerialized() throws Exception {
|
public void testReflectedIsNotSerialized() throws Exception {
|
||||||
runTest("compiler/testData/codegen/box/callableReference/serializability/reflectedIsNotSerialized.kt");
|
runTest("compiler/testData/codegen/box/callableReference/serializability/reflectedIsNotSerialized.kt");
|
||||||
|
|||||||
+6
@@ -3293,6 +3293,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
|
|||||||
public void testAllFilesPresentInSerializability() throws Exception {
|
public void testAllFilesPresentInSerializability() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
@@ -3347,6 +3347,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
|
|||||||
public void testAllFilesPresentInSerializability() throws Exception {
|
public void testAllFilesPresentInSerializability() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
@@ -3347,6 +3347,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
|
|||||||
public void testAllFilesPresentInSerializability() throws Exception {
|
public void testAllFilesPresentInSerializability() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
@@ -3347,6 +3347,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
|
|||||||
public void testAllFilesPresentInSerializability() throws Exception {
|
public void testAllFilesPresentInSerializability() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
@@ -3457,6 +3457,12 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes
|
|||||||
public void testAllFilesPresentInSerializability() throws Exception {
|
public void testAllFilesPresentInSerializability() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
@@ -3419,6 +3419,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
|
|||||||
public void testAllFilesPresentInSerializability() throws Exception {
|
public void testAllFilesPresentInSerializability() throws Exception {
|
||||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
|
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("referenceToCompanionFunction.kt")
|
||||||
|
public void testReferenceToCompanionFunction() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user