diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt index 0a2dac58aa4..745fd9c7f37 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.fir.backend import com.intellij.psi.PsiCompiledElement import org.jetbrains.kotlin.KtNodeTypes +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* @@ -26,19 +28,23 @@ import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl +import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns import org.jetbrains.kotlin.ir.descriptors.WrappedReceiverParameterDescriptor import org.jetbrains.kotlin.ir.expressions.IrConst import org.jetbrains.kotlin.ir.expressions.IrConstKind import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl import org.jetbrains.kotlin.ir.symbols.* -import org.jetbrains.kotlin.ir.types.IrErrorType -import org.jetbrains.kotlin.ir.types.IrType +import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl +import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.impl.IrErrorTypeImpl import org.jetbrains.kotlin.ir.util.SymbolTable +import org.jetbrains.kotlin.ir.util.isFakeOverride import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.startOffsetSkippingComments +import org.jetbrains.kotlin.types.AbstractTypeChecker +import org.jetbrains.kotlin.types.AbstractTypeCheckerContext import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.util.OperatorNameConventions @@ -279,6 +285,73 @@ internal tailrec fun FirCallableSymbol<*>.deepestMatchingOverriddenSymbol(root: return overriddenSymbol.deepestMatchingOverriddenSymbol(this) } +internal fun IrClass.findMatchingOverriddenSymbolsFromSupertypes( + irBuiltIns: IrBuiltIns, + target: IrDeclaration, + result: MutableList = mutableListOf() +): List { + for (superType in superTypes) { + val superTypeClass = superType.classOrNull + if (superTypeClass is IrClassSymbolImpl) { + superTypeClass.owner.findMatchingOverriddenSymbolsFromThisAndSupertypes(irBuiltIns, target, result) + } + } + return result +} + +private fun IrClass.findMatchingOverriddenSymbolsFromThisAndSupertypes( + irBuiltIns: IrBuiltIns, + target: IrDeclaration, + result: MutableList +): List { + for (declaration in declarations) { + when { + declaration is IrFunction && target is IrFunction -> + if (declaration !is IrConstructor && + !declaration.isFakeOverride && + declaration.descriptor.modality != Modality.FINAL && + !Visibilities.isPrivate(declaration.visibility) && + isOverriding(irBuiltIns, target, declaration) + ) { + result.add(declaration.symbol) + } + // TODO: property lookup to set overriddenSymbols for IrProperty (and accessors)? + } + } + // Stop traversing upwards if we find matching overridden symbols at this level. + if (result.isNotEmpty()) { + return result + } + return findMatchingOverriddenSymbolsFromSupertypes(irBuiltIns, target, result) +} + +fun isOverriding( + irBuiltIns: IrBuiltIns, + target: IrFunction, + superCandidate: IrFunction +): Boolean { + val typeCheckerContext = IrTypeCheckerContext(irBuiltIns) as AbstractTypeCheckerContext + fun equalTypes(first: IrType, second: IrType): Boolean { + return AbstractTypeChecker.equalTypes( + typeCheckerContext, first, second + ) || + // TODO: should pass type parameter cache, and make sure target type is indeed a matched type argument. + second.classifierOrNull is IrTypeParameterSymbol + + } + + return target.name == superCandidate.name && + // Not checking the return type (they should match each other if everything other match, otherwise it's a compilation error) + target.extensionReceiverParameter?.type?.let { + val superCandidateReceiverType = superCandidate.extensionReceiverParameter?.type + superCandidateReceiverType != null && equalTypes(it, superCandidateReceiverType) + } != false && + target.valueParameters.size == superCandidate.valueParameters.size && + target.valueParameters.zip(superCandidate.valueParameters).all { (targetParameter, superCandidateParameter) -> + equalTypes(targetParameter.type, superCandidateParameter.type) + } +} + private val nameToOperationConventionOrigin = mutableMapOf( OperatorNameConventions.PLUS to IrStatementOrigin.PLUS, OperatorNameConventions.MINUS to IrStatementOrigin.MINUS, diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index 13b11d58180..e5080da0b05 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -453,6 +453,13 @@ class Fir2IrDeclarationStorage( created.overriddenSymbols += getIrFunctionSymbol(it) as IrSimpleFunctionSymbol } } + if (!created.isFakeOverride && simpleFunction?.isOverride == true && thisReceiverOwner != null) { + thisReceiverOwner.findMatchingOverriddenSymbolsFromSupertypes(components.irBuiltIns, created).forEach { + if (it is IrSimpleFunctionSymbol) { + created.overriddenSymbols += it + } + } + } functionCache[function] = created return created } diff --git a/compiler/testData/codegen/box/bridges/abstractOverrideBridge.kt b/compiler/testData/codegen/box/bridges/abstractOverrideBridge.kt index 885fe4f9893..0fbc0c30496 100644 --- a/compiler/testData/codegen/box/bridges/abstractOverrideBridge.kt +++ b/compiler/testData/codegen/box/bridges/abstractOverrideBridge.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class Base { open fun f(x: T): String { diff --git a/compiler/testData/codegen/box/bridges/bridgeInInterface.kt b/compiler/testData/codegen/box/bridges/bridgeInInterface.kt index f41e2f89c8c..27cb95d75b2 100644 --- a/compiler/testData/codegen/box/bridges/bridgeInInterface.kt +++ b/compiler/testData/codegen/box/bridges/bridgeInInterface.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // FULL_JDK diff --git a/compiler/testData/codegen/box/bridges/overrideReturnType.kt b/compiler/testData/codegen/box/bridges/overrideReturnType.kt index 0b5111b47bf..e8d2619eb02 100644 --- a/compiler/testData/codegen/box/bridges/overrideReturnType.kt +++ b/compiler/testData/codegen/box/bridges/overrideReturnType.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class C { open fun f(): Any = "C f" } diff --git a/compiler/testData/codegen/box/bridges/simpleEnum.kt b/compiler/testData/codegen/box/bridges/simpleEnum.kt index 83af5abdc50..0446aba8c33 100644 --- a/compiler/testData/codegen/box/bridges/simpleEnum.kt +++ b/compiler/testData/codegen/box/bridges/simpleEnum.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface A { open fun foo(t: T) = "A" } diff --git a/compiler/testData/codegen/box/bridges/simpleObject.kt b/compiler/testData/codegen/box/bridges/simpleObject.kt index ed1dd458317..5ff3c8177e6 100644 --- a/compiler/testData/codegen/box/bridges/simpleObject.kt +++ b/compiler/testData/codegen/box/bridges/simpleObject.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class A { open fun foo(t: T) = "A" } diff --git a/compiler/testData/codegen/box/bridges/strListRemove.kt b/compiler/testData/codegen/box/bridges/strListRemove.kt index 3c77e134085..63219996fa7 100644 --- a/compiler/testData/codegen/box/bridges/strListRemove.kt +++ b/compiler/testData/codegen/box/bridges/strListRemove.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: J.java diff --git a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt index 21f1d71d4cb..c7c95464c59 100644 --- a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt +++ b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class A { open fun foo(t: T) = "A" } diff --git a/compiler/testData/codegen/box/bridges/typeParameterInExtensionReceiver.kt b/compiler/testData/codegen/box/bridges/typeParameterInExtensionReceiver.kt index 14c3594fee7..4d6bd6b682c 100644 --- a/compiler/testData/codegen/box/bridges/typeParameterInExtensionReceiver.kt +++ b/compiler/testData/codegen/box/bridges/typeParameterInExtensionReceiver.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface A { fun T2.foo(x: T1): String } diff --git a/compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt b/compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt index 0f67a5d1a66..509ef35fabd 100644 --- a/compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt +++ b/compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface A { fun foo(): Any? } diff --git a/compiler/testData/codegen/box/classes/kt1535.kt b/compiler/testData/codegen/box/classes/kt1535.kt index 2c1d6cb7835..76fd9b61a79 100644 --- a/compiler/testData/codegen/box/classes/kt1535.kt +++ b/compiler/testData/codegen/box/classes/kt1535.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // TODO: Enable when JS backend supports Java class library, since FunctionX are required for interoperation // IGNORE_BACKEND: JS diff --git a/compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt b/compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt index 065199121fd..e7fb2356c1c 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt +++ b/compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt b/compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt index e5d7cef9675..bc6735b3f9c 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/generate.kt b/compiler/testData/codegen/box/coroutines/generate.kt index 8e6c833f4ab..91863e3eee4 100644 --- a/compiler/testData/codegen/box/coroutines/generate.kt +++ b/compiler/testData/codegen/box/coroutines/generate.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt index 3620cd94728..d7f375fa797 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt index 2c119cb7868..75bbf60adee 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt index 37327b4980f..65a477c0cc5 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt index 857ca671fe1..51bee8a6ded 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt index 783dc90293a..73361284dc5 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt index 2011648a870..77a3e04b449 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt b/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt index 0a8205c76ae..32e6f43fe0c 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // COMMON_COROUTINES_TEST // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt b/compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt index 371337feff9..71be1cd6cbf 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // COMMON_COROUTINES_TEST // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt index 143784a738f..a65c502cb60 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt b/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt index 7d6cf416457..e292198e2be 100644 --- a/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt +++ b/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt @@ -1,8 +1,6 @@ // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST - -// TODO (SPECIAL IGNORE_BACKEND_FIR): this test isn't run in FIR mode at all due to infinite loop import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override.kt index 2c5f0915c00..dd38292f471 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override2.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override2.kt index dfe44107c4d..894d816ff78 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override2.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override2.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override3.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override3.kt index c20e5b85db2..bc8f4a711f0 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override3.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override3.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideCrossinline.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideCrossinline.kt index 82d78a8b158..b8e52b580df 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideCrossinline.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideCrossinline.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideOverriden.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideOverriden.kt index 76c041723f9..a158cf4bc9c 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideOverriden.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideOverriden.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt b/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt index 695cd21626c..b3285d0760f 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt index 4f36500536e..e444505b7b1 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt b/compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt index 27a207887b3..c1cc5d0bd9e 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR abstract class Base { abstract fun foo(a: String = "abc"): String } diff --git a/compiler/testData/codegen/box/defaultArguments/function/complexInheritance.kt b/compiler/testData/codegen/box/defaultArguments/function/complexInheritance.kt index e42790cbea0..5a8df66d795 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/complexInheritance.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/complexInheritance.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // See KT-21968 interface A { diff --git a/compiler/testData/codegen/box/defaultArguments/function/covariantOverride.kt b/compiler/testData/codegen/box/defaultArguments/function/covariantOverride.kt index 8fc90258db1..b2ad3e749c2 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/covariantOverride.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/covariantOverride.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class Foo { open fun foo(x: CharSequence = "O"): CharSequence = x } diff --git a/compiler/testData/codegen/box/defaultArguments/function/covariantOverrideGeneric.kt b/compiler/testData/codegen/box/defaultArguments/function/covariantOverrideGeneric.kt index 8303082889d..9f24919d51d 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/covariantOverrideGeneric.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/covariantOverrideGeneric.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class Foo { open fun foo(x: CharSequence = "O"): CharSequence = x } diff --git a/compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt b/compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt index cb3e0f682df..06b181e10b6 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface Foo { fun foo(a: Double = 1.0): Double } diff --git a/compiler/testData/codegen/box/defaultArguments/function/kt36188.kt b/compiler/testData/codegen/box/defaultArguments/function/kt36188.kt index a924e376825..5ed4b2a43cf 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/kt36188.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/kt36188.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS // Test for KT-36188 bug compatibility between non-IR and IR backends diff --git a/compiler/testData/codegen/box/defaultArguments/function/kt36188_2.kt b/compiler/testData/codegen/box/defaultArguments/function/kt36188_2.kt index 01fe4171b37..e0bb2edad07 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/kt36188_2.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/kt36188_2.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS // Test for KT-36188 bug compatibility between non-IR and IR backends diff --git a/compiler/testData/codegen/box/defaultArguments/function/kt5232.kt b/compiler/testData/codegen/box/defaultArguments/function/kt5232.kt index b62fb2295eb..8b91d2bd2d5 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/kt5232.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/kt5232.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface A { fun visit(a:String, b:String="") : String = b + a } diff --git a/compiler/testData/codegen/box/defaultArguments/function/trait.kt b/compiler/testData/codegen/box/defaultArguments/function/trait.kt index 5183736b60a..91bafe072f3 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/trait.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/trait.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface Base { fun bar(a: String = "abc"): String = a + " from interface" } diff --git a/compiler/testData/codegen/box/defaultArguments/signature/kt2789.kt b/compiler/testData/codegen/box/defaultArguments/signature/kt2789.kt index facc7c0cbca..043b0d071a3 100644 --- a/compiler/testData/codegen/box/defaultArguments/signature/kt2789.kt +++ b/compiler/testData/codegen/box/defaultArguments/signature/kt2789.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface FooTrait { fun make(size: Int = 16) : T diff --git a/compiler/testData/codegen/box/defaultArguments/signature/kt9428.kt b/compiler/testData/codegen/box/defaultArguments/signature/kt9428.kt index cd5195a2364..b9d89105d37 100644 --- a/compiler/testData/codegen/box/defaultArguments/signature/kt9428.kt +++ b/compiler/testData/codegen/box/defaultArguments/signature/kt9428.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class Player(val name: String) open class SlashPlayer(name: String) : Player(name) diff --git a/compiler/testData/codegen/box/defaultArguments/signature/kt9924.kt b/compiler/testData/codegen/box/defaultArguments/signature/kt9924.kt index 9cdc4b81644..8366f26008e 100644 --- a/compiler/testData/codegen/box/defaultArguments/signature/kt9924.kt +++ b/compiler/testData/codegen/box/defaultArguments/signature/kt9924.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR abstract class A { abstract fun test(a: T, b:Boolean = false) : String } diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt index 7564ffd68f0..33ef8a7acbc 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // TODO: muted automatically, investigate should it be ran for JS or not // DONT_RUN_GENERATED_CODE: JS diff --git a/compiler/testData/codegen/box/functions/defaultargs4.kt b/compiler/testData/codegen/box/functions/defaultargs4.kt index 25dfad5e588..b98b9a95d64 100644 --- a/compiler/testData/codegen/box/functions/defaultargs4.kt +++ b/compiler/testData/codegen/box/functions/defaultargs4.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface A { fun bar2(arg: Int = 239) : Int diff --git a/compiler/testData/codegen/box/functions/defaultargs5.kt b/compiler/testData/codegen/box/functions/defaultargs5.kt index e7b587b206a..91dc6f6be40 100644 --- a/compiler/testData/codegen/box/functions/defaultargs5.kt +++ b/compiler/testData/codegen/box/functions/defaultargs5.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open abstract class B { abstract fun foo2(arg: Int = 239) : Int } diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToAny.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToAny.kt index a2eb019d168..ada2a4798e8 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToAny.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToAny.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR inline class X(val x: Any) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToNullableAny.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToNullableAny.kt index 51b35754412..6b03919ece9 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToNullableAny.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToNullableAny.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR inline class X(val x: Any?) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToAny.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToAny.kt index 27912e1a5af..d2d1b4cf4b3 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToAny.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToAny.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR inline class X(val x: Any) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToInterface.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToInterface.kt index 40db2f74720..3b975f73173 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToInterface.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToInterface.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface IFoo { fun foo(): String diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToPrimitive.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToPrimitive.kt index ecdbcd17a9d..9b7869df701 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToPrimitive.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToPrimitive.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR inline class X(val x: Char) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt index 214dfab7357..ec59395686a 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideUnrelatedInterfaces.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideUnrelatedInterfaces.kt index fb7ce98fdea..dfe83aeb765 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideUnrelatedInterfaces.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideUnrelatedInterfaces.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface IQ1 interface IQ2 diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverride.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverride.kt index d8cf4b3bf6d..e73747c0f68 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverride.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverride.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - inline class X(val x: Any) interface IFoo { diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverrideSpecialized.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverrideSpecialized.kt index 3d2762a2da2..f4866cb4e7d 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverrideSpecialized.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverrideSpecialized.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - interface GFoo { fun foo(): T } diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/inlineClassInOverriddenReturnTypes.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/inlineClassInOverriddenReturnTypes.kt index d9ece341ce5..320216a6838 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/inlineClassInOverriddenReturnTypes.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/inlineClassInOverriddenReturnTypes.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR inline class X(val x: String) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt28483.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt28483.kt index f427b769ed8..33b3da1c8ae 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt28483.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt28483.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - inline class ResultOrClosed(val x: Any?) interface A { diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAny.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAny.kt index 8d6f3da5a22..89a80da3218 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAny.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAny.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - inline class X(val x: Any?) interface IFoo { diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAnyNull.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAnyNull.kt index b4a6dcf6261..ee0ac89b982 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAnyNull.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAnyNull.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR inline class X(val x: Any?) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAny.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAny.kt index 446136c4f60..7c92c6439bd 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAny.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAny.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR inline class X(val x: Any?) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAnyNull.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAnyNull.kt index 18de699f8be..86335371e13 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAnyNull.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAnyNull.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR inline class X(val x: Any?) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1a.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1a.kt index f1886272c01..7b585e15161 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1a.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1a.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface IQ { fun ok(): String diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1b.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1b.kt index 1e2110dffac..fb47f66964c 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1b.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1b.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface IQ { fun ok(): String diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2a.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2a.kt index 31d0787492a..8259c6d7370 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2a.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2a.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - interface IBase interface IQ : IBase { diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2b.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2b.kt index a4d98098819..cf9125b1d8d 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2b.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2b.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - interface IBase interface IQ : IBase { diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/unrelatedGenerics.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/unrelatedGenerics.kt index e4ba566b502..631fc61d74e 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/unrelatedGenerics.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/unrelatedGenerics.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - interface IFoo1 { fun foo(): T } diff --git a/compiler/testData/codegen/box/inlineClasses/bridgesWhenInlineClassImplementsGenericInterface.kt b/compiler/testData/codegen/box/inlineClasses/bridgesWhenInlineClassImplementsGenericInterface.kt index f61e3adf01a..44f7a15aafd 100644 --- a/compiler/testData/codegen/box/inlineClasses/bridgesWhenInlineClassImplementsGenericInterface.kt +++ b/compiler/testData/codegen/box/inlineClasses/bridgesWhenInlineClassImplementsGenericInterface.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR inline class InlinedComparable(val x: Int) : Comparable { override fun compareTo(other: InlinedComparable): Int { diff --git a/compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt b/compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt index a46b940ab52..f805018d1b6 100644 --- a/compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt +++ b/compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR interface Base { fun result(): Int diff --git a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultInterfaceFunParameterValuesOfInlineClassType.kt b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultInterfaceFunParameterValuesOfInlineClassType.kt index d395bb8bd55..f49bf6532f9 100644 --- a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultInterfaceFunParameterValuesOfInlineClassType.kt +++ b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultInterfaceFunParameterValuesOfInlineClassType.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR inline class Z(val z: Int) diff --git a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultParameterValuesOfInlineClassTypeBoxing.kt b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultParameterValuesOfInlineClassTypeBoxing.kt index 1d3cf65a074..a7e07d8845b 100644 --- a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultParameterValuesOfInlineClassTypeBoxing.kt +++ b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultParameterValuesOfInlineClassTypeBoxing.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR interface IFoo { fun foo(): String diff --git a/compiler/testData/codegen/box/inlineClasses/functionNameMangling/overridingMethodInGenericClass2.kt b/compiler/testData/codegen/box/inlineClasses/functionNameMangling/overridingMethodInGenericClass2.kt index b4a96bc5bd4..ecd79887a64 100644 --- a/compiler/testData/codegen/box/inlineClasses/functionNameMangling/overridingMethodInGenericClass2.kt +++ b/compiler/testData/codegen/box/inlineClasses/functionNameMangling/overridingMethodInGenericClass2.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +InlineClasses +// IGNORE_BACKEND_FIR: JVM_IR abstract class GenericBase { abstract fun foo(x: T): T diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/complexGenericMethodWithInlineClassOverride2.kt b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/complexGenericMethodWithInlineClassOverride2.kt index c765d9aa0dd..728b49b9830 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/complexGenericMethodWithInlineClassOverride2.kt +++ b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/complexGenericMethodWithInlineClassOverride2.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR inline class A(val s: String) diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceExtensionFunCall.kt b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceExtensionFunCall.kt index 925c6cee3b0..e54809f4f70 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceExtensionFunCall.kt +++ b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceExtensionFunCall.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR interface IFoo { fun Long.foo() = bar() diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceMethodCall.kt b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceMethodCall.kt index b0a8c0a1360..465f5227353 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceMethodCall.kt +++ b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceMethodCall.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR interface IFoo { fun foo() = bar() diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceExtensionFunCall.kt b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceExtensionFunCall.kt index 93e5cc74d28..a2d19a00e7e 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceExtensionFunCall.kt +++ b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceExtensionFunCall.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR interface IFoo> { fun T.foo(): String = bar() diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceMethodCall.kt b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceMethodCall.kt index 1a2ea952e26..bb57c312aa5 100644 --- a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceMethodCall.kt +++ b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceMethodCall.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR interface IFoo> { fun foo(t: T): String = t.bar() diff --git a/compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt b/compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt index 349b9cb8aa8..1ca7d80d642 100644 --- a/compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt +++ b/compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR interface IFoo { fun foo(): String diff --git a/compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt b/compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt index ad29617a40d..2102d77b698 100644 --- a/compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt +++ b/compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR interface IBase { fun testDefault1() = if (this is B) this.foo() else "fail" diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt index a88e9cc776e..f5bc9031eb0 100644 --- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt +++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // TODO: muted automatically, investigate should it be ran for JS or not // IGNORE_BACKEND: JS, NATIVE diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt index 9363baa10a6..b609d2c3fc8 100644 --- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt +++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // TODO: muted automatically, investigate should it be ran for JS or not // IGNORE_BACKEND: JS, NATIVE diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt index 123e036c5cf..d68c6862329 100644 --- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt +++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM open class A : Cloneable { diff --git a/compiler/testData/codegen/box/jdk/kt1397.kt b/compiler/testData/codegen/box/jdk/kt1397.kt index 33116232260..d4cae003aa7 100644 --- a/compiler/testData/codegen/box/jdk/kt1397.kt +++ b/compiler/testData/codegen/box/jdk/kt1397.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // IGNORE_BACKEND: NATIVE diff --git a/compiler/testData/codegen/box/jvm8/bridgeInClass.kt b/compiler/testData/codegen/box/jvm8/bridgeInClass.kt index e0a55b34537..4749d792173 100644 --- a/compiler/testData/codegen/box/jvm8/bridgeInClass.kt +++ b/compiler/testData/codegen/box/jvm8/bridgeInClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/bridgeInInterface.kt b/compiler/testData/codegen/box/jvm8/bridgeInInterface.kt index 2dcb7bf0904..ee13f8fe4f4 100644 --- a/compiler/testData/codegen/box/jvm8/bridgeInInterface.kt +++ b/compiler/testData/codegen/box/jvm8/bridgeInInterface.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInClass.kt index 1c579ed2838..04efc5c77c9 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInClass.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInClass.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all-compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface.kt index 6ecdc321ad9..3114fb331e3 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all-compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface2.kt index 30aab3e3add..32b026d9377 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface2.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all-compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // IGNORE_BACKEND: ANDROID // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt index 9289da81ce4..4b2012a071e 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: enable -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt index 319a1cb1113..07bc4c0c248 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: enable -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInClass.kt index 7465f9ce8f1..c02e44b12c8 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInClass.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInClass.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface.kt index 220db5d24c6..e2a60f85e79 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface2.kt index 9f804de9f29..673d20d4d6b 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface2.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // IGNORE_BACKEND: ANDROID // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/kt11969.kt b/compiler/testData/codegen/box/jvm8/kt11969.kt index 5c60f8495dd..32a659ed557 100644 --- a/compiler/testData/codegen/box/jvm8/kt11969.kt +++ b/compiler/testData/codegen/box/jvm8/kt11969.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/localClasses/kt3210.kt b/compiler/testData/codegen/box/localClasses/kt3210.kt index 03fe45321e8..12c9b1cba6e 100644 --- a/compiler/testData/codegen/box/localClasses/kt3210.kt +++ b/compiler/testData/codegen/box/localClasses/kt3210.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR package org.example interface SomeTrait {} diff --git a/compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt b/compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt index 64424c1dd80..e5530d5d9e3 100644 --- a/compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt +++ b/compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND_FIR: JVM_IR open class A { internal open val field = "F" diff --git a/compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt b/compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt index 422f510101e..40bcb6b6077 100644 --- a/compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt +++ b/compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND_FIR: JVM_IR open class A { internal open val field = "F" diff --git a/compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt b/compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt index b7881fe10b3..957816c8974 100644 --- a/compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt +++ b/compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface A : Comparable class B(val x: Int) : A { diff --git a/compiler/testData/codegen/box/primitiveTypes/number.kt b/compiler/testData/codegen/box/primitiveTypes/number.kt index 36a63033125..65be59a99aa 100644 --- a/compiler/testData/codegen/box/primitiveTypes/number.kt +++ b/compiler/testData/codegen/box/primitiveTypes/number.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: FortyTwoExtractor.java diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt index 4bd3b9a43dc..f7338fc62cd 100644 --- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt +++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/contains/inRangeWithCustomContains.kt b/compiler/testData/codegen/box/ranges/contains/inRangeWithCustomContains.kt index 5355babfc68..0cc89724e87 100644 --- a/compiler/testData/codegen/box/ranges/contains/inRangeWithCustomContains.kt +++ b/compiler/testData/codegen/box/ranges/contains/inRangeWithCustomContains.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // TODO: muted automatically, investigate should it be ran for JS or not // IGNORE_BACKEND: JS diff --git a/compiler/testData/codegen/box/reflection/enclosing/kt11969.kt b/compiler/testData/codegen/box/reflection/enclosing/kt11969.kt index 954a61f1c88..2aa5ad0bd50 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/kt11969.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/kt11969.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // TARGET_BACKEND: JVM package test diff --git a/compiler/testData/codegen/box/specialBuiltins/removeSetInt.kt b/compiler/testData/codegen/box/specialBuiltins/removeSetInt.kt index 48dcbc92e93..03de077a41e 100644 --- a/compiler/testData/codegen/box/specialBuiltins/removeSetInt.kt +++ b/compiler/testData/codegen/box/specialBuiltins/removeSetInt.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // IGNORE_BACKEND: NATIVE class MySet : HashSet() { diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt index 9d8a0f0a7ea..b64b58d68f2 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt @@ -30,16 +30,22 @@ FILE fqName: fileName:/delegatedImplementation.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:BaseImpl modality:FINAL visibility:public superTypes:[.IBase]' FUN name:foo visibility:public modality:FINAL <> ($this:.BaseImpl, x:kotlin.Int, s:kotlin.String) returnType:kotlin.Unit + overridden: + public abstract fun foo (x: kotlin.Int, s: kotlin.String): kotlin.Unit declared in .IBase $this: VALUE_PARAMETER name: type:.BaseImpl VALUE_PARAMETER name:x index:0 type:kotlin.Int VALUE_PARAMETER name:s index:1 type:kotlin.String BLOCK_BODY FUN name:bar visibility:public modality:FINAL <> ($this:.BaseImpl) returnType:kotlin.Int + overridden: + public abstract fun bar (): kotlin.Int declared in .IBase $this: VALUE_PARAMETER name: type:.BaseImpl BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun bar (): kotlin.Int declared in .BaseImpl' CONST Int type=kotlin.Int value=42 FUN name:qux visibility:public modality:FINAL <> ($this:.BaseImpl, $receiver:kotlin.String) returnType:kotlin.Unit + overridden: + public abstract fun qux (): kotlin.Unit declared in .IBase $this: VALUE_PARAMETER name: type:.BaseImpl $receiver: VALUE_PARAMETER name: type:kotlin.String BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt index 6a393e2a576..af4196370d7 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt @@ -25,9 +25,13 @@ FILE fqName: fileName:/delegatedImplementationWithExplicitOverride.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:FooBarImpl modality:FINAL visibility:public superTypes:[.IFooBar]' FUN name:foo visibility:public modality:FINAL <> ($this:.FooBarImpl) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .IFooBar $this: VALUE_PARAMETER name: type:.FooBarImpl BLOCK_BODY FUN name:bar visibility:public modality:FINAL <> ($this:.FooBarImpl) returnType:kotlin.Unit + overridden: + public abstract fun bar (): kotlin.Unit declared in .IFooBar $this: VALUE_PARAMETER name: type:.FooBarImpl BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -50,6 +54,8 @@ FILE fqName: fileName:/delegatedImplementationWithExplicitOverride.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[.IFooBar]' FUN name:bar visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Unit + overridden: + public abstract fun bar (): kotlin.Unit declared in .IFooBar $this: VALUE_PARAMETER name: type:.C BLOCK_BODY FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:.IFooBar) returnType:kotlin.Unit [fake_override] diff --git a/compiler/testData/ir/irText/classes/enum.fir.txt b/compiler/testData/ir/irText/classes/enum.fir.txt index 0aa02b48ac8..5facc0c4091 100644 --- a/compiler/testData/ir/irText/classes/enum.fir.txt +++ b/compiler/testData/ir/irText/classes/enum.fir.txt @@ -276,6 +276,8 @@ FILE fqName: fileName:/enum.kt ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestEnum3' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:private superTypes:[.TestEnum3]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestEnum3.TEST) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .TestEnum3 $this: VALUE_PARAMETER name: type:.TestEnum3.TEST BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null @@ -385,6 +387,8 @@ FILE fqName: fileName:/enum.kt x: CONST Int type=kotlin.Int value=1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum4]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestEnum4.TEST1) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .TestEnum4 $this: VALUE_PARAMETER name: type:.TestEnum4.TEST1 BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null @@ -455,6 +459,8 @@ FILE fqName: fileName:/enum.kt value: CALL 'public final fun (): kotlin.Int declared in .TestEnum4' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .TestEnum4.TEST2 declared in .TestEnum4.TEST2' type=.TestEnum4.TEST2 origin=null FUN name:foo visibility:public modality:FINAL <> ($this:.TestEnum4.TEST2) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .TestEnum4 $this: VALUE_PARAMETER name: type:.TestEnum4.TEST2 BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/classes/enumClassModality.fir.txt b/compiler/testData/ir/irText/classes/enumClassModality.fir.txt index f44de09aa5b..0951deaf4cc 100644 --- a/compiler/testData/ir/irText/classes/enumClassModality.fir.txt +++ b/compiler/testData/ir/irText/classes/enumClassModality.fir.txt @@ -225,6 +225,8 @@ FILE fqName: fileName:/enumClassModality.kt ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestOpenEnum1' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestOpenEnum1]' FUN name:toString visibility:public modality:FINAL <> ($this:.TestOpenEnum1.X1) returnType:kotlin.String + overridden: + public open fun toString (): kotlin.String declared in kotlin.Enum $this: VALUE_PARAMETER name: type:.TestOpenEnum1.X1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun toString (): kotlin.String declared in .TestOpenEnum1.X1' @@ -315,6 +317,8 @@ FILE fqName: fileName:/enumClassModality.kt ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestOpenEnum2' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestOpenEnum2]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestOpenEnum2.X1) returnType:kotlin.Unit + overridden: + public open fun foo (): kotlin.Unit declared in .TestOpenEnum2 $this: VALUE_PARAMETER name: type:.TestOpenEnum2.X1 BLOCK_BODY FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] @@ -410,6 +414,8 @@ FILE fqName: fileName:/enumClassModality.kt ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestAbstractEnum1' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestAbstractEnum1]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestAbstractEnum1.X1) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .TestAbstractEnum1 $this: VALUE_PARAMETER name: type:.TestAbstractEnum1.X1 BLOCK_BODY FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] @@ -521,6 +527,8 @@ FILE fqName: fileName:/enumClassModality.kt ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestAbstractEnum2' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestAbstractEnum2]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestAbstractEnum2.X1) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .IFoo $this: VALUE_PARAMETER name: type:.TestAbstractEnum2.X1 BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt index 7fb29fe421d..f3eb7cad613 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt @@ -83,6 +83,8 @@ FILE fqName: fileName:/enumWithMultipleCtors.kt ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .A' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:Y modality:FINAL visibility:private superTypes:[.A]' FUN name:f visibility:public modality:FINAL <> ($this:.A.Y) returnType:kotlin.String + overridden: + public open fun f (): kotlin.String declared in .A $this: VALUE_PARAMETER name: type:.A.Y BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun f (): kotlin.String declared in .A.Y' diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt index dbc535a90c3..40a6b48ee2d 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt @@ -300,6 +300,8 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .Test2' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:private superTypes:[.Test2]' FUN name:foo visibility:public modality:FINAL <> ($this:.Test2.ZERO) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .Test2 $this: VALUE_PARAMETER name: type:.Test2.ZERO BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null @@ -355,6 +357,8 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt x: CONST Int type=kotlin.Int value=1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:private superTypes:[.Test2]' FUN name:foo visibility:public modality:FINAL <> ($this:.Test2.ONE) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .Test2 $this: VALUE_PARAMETER name: type:.Test2.ONE BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt index ddeaeb39bd3..ae63b73f88d 100644 --- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt +++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt @@ -46,6 +46,8 @@ FILE fqName: fileName:/implicitNotNullOnDelegatedImplementation.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .JFoo' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K2 modality:FINAL visibility:public superTypes:[.JFoo]' FUN name:foo visibility:public modality:FINAL <> ($this:.K2) returnType:kotlin.String + overridden: + public abstract fun foo (): kotlin.String declared in .IFoo $this: VALUE_PARAMETER name: type:.K2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in .K2' @@ -94,6 +96,8 @@ FILE fqName: fileName:/implicitNotNullOnDelegatedImplementation.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .JUnrelatedFoo' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K4 modality:FINAL visibility:public superTypes:[.JUnrelatedFoo; .IFoo]' FUN name:foo visibility:public modality:FINAL <> ($this:.K4) returnType:kotlin.String? + overridden: + public abstract fun foo (): kotlin.String declared in .IFoo $this: VALUE_PARAMETER name: type:.K4 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String? declared in .K4' diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.fir.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.fir.txt index cb369b84574..391c8911b82 100644 --- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.fir.txt +++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.fir.txt @@ -56,6 +56,8 @@ FILE fqName: fileName:/objectLiteralExpressions.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.IFoo]' FUN name:foo visibility:public modality:FINAL <> ($this:.test2.) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .IFoo $this: VALUE_PARAMETER name: type:.test2. BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null @@ -121,6 +123,8 @@ FILE fqName: fileName:/objectLiteralExpressions.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Outer.Inner' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Outer.Inner]' FUN name:foo visibility:public modality:FINAL <> ($this:.Outer.test3.) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .IFoo $this: VALUE_PARAMETER name: type:.Outer.test3. BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null @@ -164,6 +168,8 @@ FILE fqName: fileName:/objectLiteralExpressions.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Outer.Inner' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Outer.Inner]' FUN name:foo visibility:public modality:FINAL <> ($this:.test4.) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .IFoo $this: VALUE_PARAMETER name: type:.test4. BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt index 28f7553de47..3f98c889153 100644 --- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt +++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt @@ -56,6 +56,9 @@ FILE fqName: fileName:/qualifiedSuperCalls.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:CBoth modality:FINAL visibility:public superTypes:[.ILeft; .IRight]' FUN name:foo visibility:public modality:FINAL <> ($this:.CBoth) returnType:kotlin.Unit + overridden: + public open fun foo (): kotlin.Unit declared in .ILeft + public open fun foo (): kotlin.Unit declared in .IRight $this: VALUE_PARAMETER name: type:.CBoth BLOCK_BODY CALL 'public open fun foo (): kotlin.Unit declared in .ILeft' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/classes/superCalls.fir.txt b/compiler/testData/ir/irText/classes/superCalls.fir.txt index c354aafc4f8..44f49cc2d0b 100644 --- a/compiler/testData/ir/irText/classes/superCalls.fir.txt +++ b/compiler/testData/ir/irText/classes/superCalls.fir.txt @@ -41,6 +41,8 @@ FILE fqName: fileName:/superCalls.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Base' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[.Base]' FUN name:foo visibility:public modality:FINAL <> ($this:.Derived) returnType:kotlin.Unit + overridden: + public open fun foo (): kotlin.Unit declared in .Base $this: VALUE_PARAMETER name: type:.Derived BLOCK_BODY CALL 'public open fun foo (): kotlin.Unit declared in .Base' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/declarations/localClassWithOverrides.fir.txt b/compiler/testData/ir/irText/declarations/localClassWithOverrides.fir.txt index e2d86850856..1731d4e9e24 100644 --- a/compiler/testData/ir/irText/declarations/localClassWithOverrides.fir.txt +++ b/compiler/testData/ir/irText/declarations/localClassWithOverrides.fir.txt @@ -41,6 +41,8 @@ FILE fqName: fileName:/localClassWithOverrides.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .outer.ALocal' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Local modality:FINAL visibility:local superTypes:[.outer.ALocal]' FUN name:afun visibility:public modality:FINAL <> ($this:.outer.Local) returnType:kotlin.Unit + overridden: + public abstract fun afun (): kotlin.Unit declared in .outer.ALocal $this: VALUE_PARAMETER name: type:.outer.Local BLOCK_BODY PROPERTY name:aval visibility:public modality:FINAL [val] diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.fir.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.fir.txt index eca948675cc..6b2b0cbcfb8 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.fir.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.fir.txt @@ -74,6 +74,8 @@ FILE fqName: fileName:/expectClassInherited.kt DELEGATING_CONSTRUCTOR_CALL 'protected constructor () [primary] declared in .A' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:OPEN visibility:public superTypes:[.A]' FUN name:foo visibility:public modality:OPEN <> ($this:.B) returnType:kotlin.Unit + overridden: + public abstract fun foo (): kotlin.Unit declared in .A $this: VALUE_PARAMETER name: type:.B BLOCK_BODY FUN name:bar visibility:public modality:OPEN <> ($this:.B, s:kotlin.String) returnType:kotlin.Unit diff --git a/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.fir.txt index 075c48f6624..6495ec3eb86 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.fir.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.fir.txt @@ -37,6 +37,8 @@ FILE fqName: fileName:/unboundMemberReferenceWithAdaptedArguments.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Obj modality:FINAL visibility:public superTypes:[.A]' FUN name:foo visibility:public modality:FINAL <> ($this:.Obj, xs:kotlin.IntArray) returnType:kotlin.Int + overridden: + public open fun foo (vararg xs: kotlin.Int): kotlin.Int declared in .A $this: VALUE_PARAMETER name: type:.Obj VALUE_PARAMETER name:xs index:0 type:kotlin.IntArray varargElementType:kotlin.Int [vararg] BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt b/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt index d8562839d6c..064a619fb53 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt @@ -66,6 +66,8 @@ FILE fqName: fileName:/partialSam.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Fn]' FUN name:run visibility:public modality:FINAL <> ($this:.fsi., s:kotlin.String, i:kotlin.Int, t:kotlin.String) returnType:kotlin.Int + overridden: + public abstract fun run (s: kotlin.String, i: kotlin.Int, t: T of .Fn): R of .Fn declared in .Fn $this: VALUE_PARAMETER name: type:.fsi. VALUE_PARAMETER name:s index:0 type:kotlin.String VALUE_PARAMETER name:i index:1 type:kotlin.Int @@ -103,6 +105,8 @@ FILE fqName: fileName:/partialSam.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Fn]' FUN name:run visibility:public modality:FINAL <> ($this:.fis., s:kotlin.String, i:kotlin.Int, t:kotlin.Int) returnType:kotlin.String + overridden: + public abstract fun run (s: kotlin.String, i: kotlin.Int, t: T of .Fn): R of .Fn declared in .Fn $this: VALUE_PARAMETER name: type:.fis. VALUE_PARAMETER name:s index:0 type:kotlin.String VALUE_PARAMETER name:i index:1 type:kotlin.Int diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt index 50a45c7deee..99110fd5425 100644 --- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt +++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt @@ -10,6 +10,8 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt x: GET_VAR 'x: T of .Derived1 declared in .Derived1.' type=T of .Derived1 origin=null INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived1 modality:FINAL visibility:public superTypes:[.Base.Derived1>]' FUN name:foo visibility:public modality:FINAL ($this:.Derived1.Derived1>, y:Y of .Derived1.foo) returnType:T of .Derived1 + overridden: + public abstract fun foo (y: Y of .Base.foo): T of .Base declared in .Base TYPE_PARAMETER name:Y index:0 variance: superTypes:[kotlin.Any?] $this: VALUE_PARAMETER name: type:.Derived1.Derived1> VALUE_PARAMETER name:y index:0 type:Y of .Derived1.foo diff --git a/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.fir.txt b/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.fir.txt index b6e2ab73a16..a6746834ab8 100644 --- a/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.fir.txt +++ b/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.fir.txt @@ -132,6 +132,8 @@ FILE fqName: fileName:/genericDelegatedDeepProperty.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:r type:R of .CR visibility:private [final]' type=R of .CR origin=null receiver: GET_VAR ': .CR.CR> declared in .CR.' type=.CR.CR> origin=null FUN name:foo visibility:public modality:FINAL <> ($this:.CR.CR>) returnType:R of .CR + overridden: + public abstract fun foo (): R of .IR declared in .IR $this: VALUE_PARAMETER name: type:.CR.CR> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): R of .CR declared in .CR' @@ -231,6 +233,8 @@ FILE fqName: fileName:/genericDelegatedDeepProperty.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.IDelegate1<.Value., .CR.>>, T of .>]' FUN name:getValue visibility:public modality:FINAL <> ($this:.additionalText$delegate..deepO$delegate..>, t:.Value., .CR.>>, p:kotlin.reflect.KProperty<*>) returnType:T of . + overridden: + public abstract fun getValue (t: T1 of .IDelegate1, p: kotlin.reflect.KProperty<*>): R1 of .IDelegate1 [operator] declared in .IDelegate1 $this: VALUE_PARAMETER name: type:.additionalText$delegate..deepO$delegate..> VALUE_PARAMETER name:t index:0 type:.Value., .CR.>> VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*> @@ -289,6 +293,8 @@ FILE fqName: fileName:/genericDelegatedDeepProperty.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.IDelegate1<.Value., .CR.>>, T of .>]' FUN name:getValue visibility:public modality:FINAL <> ($this:.additionalText$delegate..deepK$delegate..>, t:.Value., .CR.>>, p:kotlin.reflect.KProperty<*>) returnType:T of . + overridden: + public abstract fun getValue (t: T1 of .IDelegate1, p: kotlin.reflect.KProperty<*>): R1 of .IDelegate1 [operator] declared in .IDelegate1 $this: VALUE_PARAMETER name: type:.additionalText$delegate..deepK$delegate..> VALUE_PARAMETER name:t index:0 type:.Value., .CR.>> VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*> @@ -323,6 +329,8 @@ FILE fqName: fileName:/genericDelegatedDeepProperty.kt t: GET_VAR ': .additionalText$delegate..> declared in .additionalText$delegate..' type=.additionalText$delegate..> origin=null p: PROPERTY_REFERENCE 'private final deepK: T of . [delegated,val]' field=null getter='public final fun (): T of . declared in .additionalText$delegate.' setter=null type=kotlin.reflect.KProperty2<.Value., .CR.>>, *, T of .> origin=PROPERTY_REFERENCE_FOR_DELEGATE FUN name:getValue visibility:public modality:FINAL <> ($this:.additionalText$delegate..>, t:.Value., .CR.>>, p:kotlin.reflect.KProperty<*>) returnType:.P., T of .> + overridden: + public abstract fun getValue (t: T1 of .IDelegate1, p: kotlin.reflect.KProperty<*>): R1 of .IDelegate1 [operator] declared in .IDelegate1 $this: VALUE_PARAMETER name: type:.additionalText$delegate..> VALUE_PARAMETER name:t index:0 type:.Value., .CR.>> VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*> diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt index d8a5b8c0f56..879a1f4cfe3 100644 --- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt @@ -16,6 +16,8 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .MySet' CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin' type=kotlin.Nothing origin=null FUN name:contains visibility:public modality:FINAL <> ($this:.MySet, element:kotlin.String) returnType:kotlin.Boolean + overridden: + public abstract fun contains (element: E of kotlin.collections.Set): kotlin.Boolean [operator] declared in kotlin.collections.Set $this: VALUE_PARAMETER name: type:.MySet VALUE_PARAMETER name:element index:0 type:kotlin.String BLOCK_BODY @@ -28,11 +30,15 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt RETURN type=kotlin.Nothing from='public final fun containsAll (elements: kotlin.collections.Collection): kotlin.Boolean declared in .MySet' CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin' type=kotlin.Nothing origin=null FUN name:isEmpty visibility:public modality:FINAL <> ($this:.MySet) returnType:kotlin.Boolean + overridden: + public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Set $this: VALUE_PARAMETER name: type:.MySet BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun isEmpty (): kotlin.Boolean declared in .MySet' CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin' type=kotlin.Nothing origin=null FUN name:iterator visibility:public modality:FINAL <> ($this:.MySet) returnType:kotlin.collections.Iterator + overridden: + public abstract fun iterator (): kotlin.collections.Iterator [operator] declared in kotlin.collections.Set $this: VALUE_PARAMETER name: type:.MySet BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun iterator (): kotlin.collections.Iterator declared in .MySet' diff --git a/compiler/testData/ir/irText/types/receiverOfIntersectionType.fir.txt b/compiler/testData/ir/irText/types/receiverOfIntersectionType.fir.txt index 16484d5b08c..dcd60b86d5e 100644 --- a/compiler/testData/ir/irText/types/receiverOfIntersectionType.fir.txt +++ b/compiler/testData/ir/irText/types/receiverOfIntersectionType.fir.txt @@ -53,6 +53,8 @@ FILE fqName: fileName:/receiverOfIntersectionType.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[.I; .J]' FUN name:ff visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Unit + overridden: + public abstract fun ff (): kotlin.Unit declared in .I $this: VALUE_PARAMETER name: type:.A BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -75,6 +77,8 @@ FILE fqName: fileName:/receiverOfIntersectionType.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public superTypes:[.I; .J]' FUN name:ff visibility:public modality:FINAL <> ($this:.B) returnType:kotlin.Unit + overridden: + public abstract fun ff (): kotlin.Unit declared in .I $this: VALUE_PARAMETER name: type:.B BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt index a486d861e16..c1e8d1916ca 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt @@ -14,13 +14,4 @@ abstract class AbstractFirBlackBoxCodegenTest : AbstractIrBlackBoxCodegenTest() configuration.put(CommonConfigurationKeys.USE_FIR, true) configuration.put(JVMConfigurationKeys.IR, true) } - - override fun doTest(filePath: String) { - if (filePath.endsWith("overrideDefaultArgument.kt")) { - // TODO: made to prevent infinite loop in the particular test - // Remove me when fixed - return - } - super.doTest(filePath) - } }