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 cae21278d2b..153c55f7afb 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 @@ -10,10 +10,8 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns.* import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter -import org.jetbrains.kotlin.fir.declarations.impl.FirPropertyAccessorImpl import org.jetbrains.kotlin.fir.descriptors.FirBuiltInsPackageFragment import org.jetbrains.kotlin.fir.descriptors.FirModuleDescriptor import org.jetbrains.kotlin.fir.descriptors.FirPackageFragmentDescriptor @@ -455,7 +453,7 @@ class Fir2IrDeclarationStorage( created.overriddenSymbols += getIrFunctionSymbol(it) as IrSimpleFunctionSymbol } } - if (!created.isFakeOverride && simpleFunction?.isOverride == true && thisReceiverOwner != null) { + if (!created.isFakeOverride && thisReceiverOwner != null) { created.populateOverriddenSymbols(thisReceiverOwner) } functionCache[function] = created @@ -573,12 +571,7 @@ class Fir2IrDeclarationStorage( parent = irParent } correspondingPropertySymbol = correspondingProperty.symbol - val isOverride = when (propertyAccessor) { - is FirDefaultPropertyAccessor -> property.isOverride - is FirPropertyAccessorImpl -> propertyAccessor.status.isOverride - else -> false - } - if (!isFakeOverride && isOverride && thisReceiverOwner != null) { + if (!isFakeOverride && thisReceiverOwner != null) { populateOverriddenSymbols(thisReceiverOwner) } } @@ -608,7 +601,7 @@ class Fir2IrDeclarationStorage( isFakeOverride = origin == IrDeclarationOrigin.FAKE_OVERRIDE ).also { it.correspondingPropertySymbol = this@createBackingField.symbol - if (!isFakeOverride && property.isOverride && thisReceiverOwner != null) { + if (!isFakeOverride && thisReceiverOwner != null) { it.populateOverriddenSymbols(thisReceiverOwner) } } diff --git a/compiler/testData/codegen/box/annotations/annotatedObjectLiteral.kt b/compiler/testData/codegen/box/annotations/annotatedObjectLiteral.kt index d90b513cb75..172cf98b9b6 100644 --- a/compiler/testData/codegen/box/annotations/annotatedObjectLiteral.kt +++ b/compiler/testData/codegen/box/annotations/annotatedObjectLiteral.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/annotations/annotationsOnDefault.kt b/compiler/testData/codegen/box/annotations/annotationsOnDefault.kt index a141f1aa5ce..2c6f768f86d 100644 --- a/compiler/testData/codegen/box/annotations/annotationsOnDefault.kt +++ b/compiler/testData/codegen/box/annotations/annotationsOnDefault.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/boxingOptimization/progressions.kt b/compiler/testData/codegen/box/boxingOptimization/progressions.kt index cf74a32a33f..5ea2b777575 100644 --- a/compiler/testData/codegen/box/boxingOptimization/progressions.kt +++ b/compiler/testData/codegen/box/boxingOptimization/progressions.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/bridges/propertyDiamondFakeOverride.kt b/compiler/testData/codegen/box/bridges/propertyDiamondFakeOverride.kt index f5c6f74b578..3b8f3de8130 100644 --- a/compiler/testData/codegen/box/bridges/propertyDiamondFakeOverride.kt +++ b/compiler/testData/codegen/box/bridges/propertyDiamondFakeOverride.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - interface A { val result: Any get() = "Fail" } diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt index 7ae1aa73122..ba7fdde2891 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt +++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM import java.util.AbstractList diff --git a/compiler/testData/codegen/box/callableReference/function/kt21787.kt b/compiler/testData/codegen/box/callableReference/function/kt21787.kt index 1b06497d881..5f8e82ca648 100644 --- a/compiler/testData/codegen/box/callableReference/function/kt21787.kt +++ b/compiler/testData/codegen/box/callableReference/function/kt21787.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME class Container { diff --git a/compiler/testData/codegen/box/closures/noRefToOuter.kt b/compiler/testData/codegen/box/closures/noRefToOuter.kt index 4ef944fa244..7ee0508e536 100644 --- a/compiler/testData/codegen/box/closures/noRefToOuter.kt +++ b/compiler/testData/codegen/box/closures/noRefToOuter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/collections/inSetWithSmartCast.kt b/compiler/testData/codegen/box/collections/inSetWithSmartCast.kt index 731c5fdfd30..e5a490931a5 100644 --- a/compiler/testData/codegen/box/collections/inSetWithSmartCast.kt +++ b/compiler/testData/codegen/box/collections/inSetWithSmartCast.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/collections/removeAtInt.kt b/compiler/testData/codegen/box/collections/removeAtInt.kt index fb0207a0561..8cb05571d02 100644 --- a/compiler/testData/codegen/box/collections/removeAtInt.kt +++ b/compiler/testData/codegen/box/collections/removeAtInt.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: J.java diff --git a/compiler/testData/codegen/box/controlStructures/forInArray/forInInlineClassArrayWithUpcast.kt b/compiler/testData/codegen/box/controlStructures/forInArray/forInInlineClassArrayWithUpcast.kt index 87f5a9e87a8..0bafd81fccb 100644 --- a/compiler/testData/codegen/box/controlStructures/forInArray/forInInlineClassArrayWithUpcast.kt +++ b/compiler/testData/codegen/box/controlStructures/forInArray/forInInlineClassArrayWithUpcast.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexCheckSideEffects.kt index 8fd3cc26f2c..b708614dbb8 100644 --- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexCheckSideEffects.kt +++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexCheckSideEffects.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoElementVarCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoElementVarCheckSideEffects.kt index adff3ef0326..f345d5d2511 100644 --- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoElementVarCheckSideEffects.kt +++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoElementVarCheckSideEffects.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoIndexVarCheckSideEffects.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoIndexVarCheckSideEffects.kt index f7f75bafa13..d0f9c59103a 100644 --- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoIndexVarCheckSideEffects.kt +++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexNoIndexVarCheckSideEffects.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/controlStructures/tryFinallyGeneric.kt b/compiler/testData/codegen/box/controlStructures/tryFinallyGeneric.kt index 0d26594a2d0..e65514bbf82 100644 --- a/compiler/testData/codegen/box/controlStructures/tryFinallyGeneric.kt +++ b/compiler/testData/codegen/box/controlStructures/tryFinallyGeneric.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // !LANGUAGE: +NewInference diff --git a/compiler/testData/codegen/box/coroutines/doubleColonExpressionsGenerationInBuilderInference.kt b/compiler/testData/codegen/box/coroutines/doubleColonExpressionsGenerationInBuilderInference.kt index 990eb0f100b..fa68468eada 100644 --- a/compiler/testData/codegen/box/coroutines/doubleColonExpressionsGenerationInBuilderInference.kt +++ b/compiler/testData/codegen/box/coroutines/doubleColonExpressionsGenerationInBuilderInference.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS, JS_IR // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt index b2a9e130863..473b4ba12ce 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_COROUTINES // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/handleException.kt b/compiler/testData/codegen/box/coroutines/handleException.kt index 7c5f5d78604..4cd66eac93b 100644 --- a/compiler/testData/codegen/box/coroutines/handleException.kt +++ b/compiler/testData/codegen/box/coroutines/handleException.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/localFunctions/named/rec.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt index 0d2ba58fa85..1c473f2c60b 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt b/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt index 38e311df85f..917aae72d2f 100644 --- a/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt +++ b/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.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/longRangeInSuspendFun.kt b/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt index 22f9555b788..c491c20c86e 100644 --- a/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt +++ b/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.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/nestedTryCatch.kt b/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt index 46cc6c9e275..350d544d3ae 100644 --- a/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt +++ b/compiler/testData/codegen/box/coroutines/nestedTryCatch.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/simpleSuspendCallableReference.kt b/compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt index 81074ebb665..b51a477ad2d 100644 --- a/compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt +++ b/compiler/testData/codegen/box/coroutines/simpleSuspendCallableReference.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +ReleaseCoroutines -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt index 49b718047a0..dfa2bab7997 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.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/tryCatchFinallyWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt index c2dee27c5b2..8e7d908d8b9 100644 --- a/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.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/tryCatchWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt index cda7ce7b112..bc9f122350f 100644 --- a/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.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/dataClasses/copy/kt12708.kt b/compiler/testData/codegen/box/dataClasses/copy/kt12708.kt index 30c31ef1560..7ad1584b800 100644 --- a/compiler/testData/codegen/box/dataClasses/copy/kt12708.kt +++ b/compiler/testData/codegen/box/dataClasses/copy/kt12708.kt @@ -1,5 +1,4 @@ // !LANGUAGE: -ProhibitDataClassesOverridingCopy -// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { val a: A = B(1) diff --git a/compiler/testData/codegen/box/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt b/compiler/testData/codegen/box/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt index 4d51a661cd1..562c46fb3fe 100644 --- a/compiler/testData/codegen/box/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt +++ b/compiler/testData/codegen/box/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt b/compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt index 9b08a03a0eb..0a74c9f497b 100644 --- a/compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt +++ b/compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM import java.util.IdentityHashMap diff --git a/compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt b/compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt index d3ac2ddf1f1..60521fe8bbf 100644 --- a/compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt +++ b/compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +NewInference -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME diff --git a/compiler/testData/codegen/box/inference/kt10822.kt b/compiler/testData/codegen/box/inference/kt10822.kt index f6f6dbd5a22..294644d8dff 100644 --- a/compiler/testData/codegen/box/inference/kt10822.kt +++ b/compiler/testData/codegen/box/inference/kt10822.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR var result = "" interface A { diff --git a/compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt b/compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt index d71ebdbc65d..1ecc929824d 100644 --- a/compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt +++ b/compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { val l: Long = 1 val l2: Long = 2 diff --git a/compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt b/compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt index 64b28a3bb60..f6550bbbd0c 100644 --- a/compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt +++ b/compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME fun box(): String { val list = ArrayList() diff --git a/compiler/testData/codegen/box/jdk/hashMap.kt b/compiler/testData/codegen/box/jdk/hashMap.kt index d9963825fb5..6bdb266364b 100644 --- a/compiler/testData/codegen/box/jdk/hashMap.kt +++ b/compiler/testData/codegen/box/jdk/hashMap.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME fun box(): String { diff --git a/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt b/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt index 134c41b1d97..bdbdbfbf127 100644 --- a/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt +++ b/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME fun box() : String { diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterfaceWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterfaceWithProperties.kt index 41990539c8d..10307f9d915 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterfaceWithProperties.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterfaceWithProperties.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/bridgeInInterfaceWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterfaceWithProperties2.kt index 0f3dff031ef..04d38a40582 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterfaceWithProperties2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterfaceWithProperties2.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/allCompatibility/bridgeWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithProperties2.kt index e27fa742223..b61193b1e24 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithProperties2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithProperties2.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all-compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: Simple.java diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithProperties3.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithProperties3.kt index ee15fb3d87f..b4be289cb7c 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithProperties3.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithProperties3.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all-compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: Simple.java diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt index 66ef7264525..314bae1c1d9 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.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/compatibility/bridgeWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt index 768f9011ddc..eb72cc03ac2 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: Simple.java diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt index 06d502ecf2a..55df395bf87 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: Simple.java diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterfaceWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterfaceWithProperties.kt index 0b83bd01686..434d2011a38 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterfaceWithProperties.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterfaceWithProperties.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/bridgeInInterfaceWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterfaceWithProperties2.kt index 5b8140f5bc6..436e15853c6 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterfaceWithProperties2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterfaceWithProperties2.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/defaults/noDefaultImpls/bridgeWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties2.kt index 3d064e532c6..28d1c51cf35 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties2.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: Simple.java diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt index cc4bf3b093d..cf5eecf6aa5 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: Simple.java diff --git a/compiler/testData/codegen/box/ranges/contains/inCustomObjectRange.kt b/compiler/testData/codegen/box/ranges/contains/inCustomObjectRange.kt index e044dc6ff9e..49dfff95372 100644 --- a/compiler/testData/codegen/box/ranges/contains/inCustomObjectRange.kt +++ b/compiler/testData/codegen/box/ranges/contains/inCustomObjectRange.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/forInCustomCharSequence.kt b/compiler/testData/codegen/box/ranges/forInCustomCharSequence.kt index 34a6c6be147..ed53c560f44 100644 --- a/compiler/testData/codegen/box/ranges/forInCustomCharSequence.kt +++ b/compiler/testData/codegen/box/ranges/forInCustomCharSequence.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullFromStdlib.kt b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullFromStdlib.kt index 0c7229f0482..d7413f9a00e 100644 --- a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullFromStdlib.kt +++ b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullFromStdlib.kt @@ -1,6 +1,5 @@ // !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // FULL_JDK diff --git a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullFromStdlibToTypedArray.kt b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullFromStdlibToTypedArray.kt index 5dc32e4c5a3..3d808f8534c 100644 --- a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullFromStdlibToTypedArray.kt +++ b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullFromStdlibToTypedArray.kt @@ -1,6 +1,5 @@ // !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // FULL_JDK diff --git a/compiler/testData/codegen/box/reflection/annotations/annotationRetentionAnnotation.kt b/compiler/testData/codegen/box/reflection/annotations/annotationRetentionAnnotation.kt index 78eb39370d2..a52c43eb697 100644 --- a/compiler/testData/codegen/box/reflection/annotations/annotationRetentionAnnotation.kt +++ b/compiler/testData/codegen/box/reflection/annotations/annotationRetentionAnnotation.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, NATIVE diff --git a/compiler/testData/codegen/box/reflection/annotations/openSuspendFun.kt b/compiler/testData/codegen/box/reflection/annotations/openSuspendFun.kt index bffee8a5695..50d3587a8b4 100644 --- a/compiler/testData/codegen/box/reflection/annotations/openSuspendFun.kt +++ b/compiler/testData/codegen/box/reflection/annotations/openSuspendFun.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // WITH_REFLECT // IGNORE_BACKEND: JS, NATIVE diff --git a/compiler/testData/codegen/box/reflection/annotations/setparam.kt b/compiler/testData/codegen/box/reflection/annotations/setparam.kt index c6ebd08c5bb..1f47bd5cdbc 100644 --- a/compiler/testData/codegen/box/reflection/annotations/setparam.kt +++ b/compiler/testData/codegen/box/reflection/annotations/setparam.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_REFLECT // IGNORE_BACKEND: JS_IR, JS, NATIVE diff --git a/compiler/testData/codegen/box/reflection/genericSignature/covariantOverride.kt b/compiler/testData/codegen/box/reflection/genericSignature/covariantOverride.kt index 8b0ab99d650..e19064a71e3 100644 --- a/compiler/testData/codegen/box/reflection/genericSignature/covariantOverride.kt +++ b/compiler/testData/codegen/box/reflection/genericSignature/covariantOverride.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT diff --git a/compiler/testData/codegen/box/reflection/methodsFromAny/typeParametersEqualsHashCode.kt b/compiler/testData/codegen/box/reflection/methodsFromAny/typeParametersEqualsHashCode.kt index 3c2f06f5873..e24e3972077 100644 --- a/compiler/testData/codegen/box/reflection/methodsFromAny/typeParametersEqualsHashCode.kt +++ b/compiler/testData/codegen/box/reflection/methodsFromAny/typeParametersEqualsHashCode.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, NATIVE diff --git a/compiler/testData/codegen/box/reflection/parameters/boundObjectMemberReferences.kt b/compiler/testData/codegen/box/reflection/parameters/boundObjectMemberReferences.kt index ed6664660d7..f82d78a51cd 100644 --- a/compiler/testData/codegen/box/reflection/parameters/boundObjectMemberReferences.kt +++ b/compiler/testData/codegen/box/reflection/parameters/boundObjectMemberReferences.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TODO: investigate should it be ran for JS or not // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/reflection/parameters/boundReferences.kt b/compiler/testData/codegen/box/reflection/parameters/boundReferences.kt index 22150c75da8..d5f1cb423cb 100644 --- a/compiler/testData/codegen/box/reflection/parameters/boundReferences.kt +++ b/compiler/testData/codegen/box/reflection/parameters/boundReferences.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // TODO: investigate should it be ran for JS or not // IGNORE_BACKEND: JS, NATIVE diff --git a/compiler/testData/codegen/box/reflection/parameters/instanceExtensionReceiverAndValueParameters.kt b/compiler/testData/codegen/box/reflection/parameters/instanceExtensionReceiverAndValueParameters.kt index 7b3086ac617..231597d0ded 100644 --- a/compiler/testData/codegen/box/reflection/parameters/instanceExtensionReceiverAndValueParameters.kt +++ b/compiler/testData/codegen/box/reflection/parameters/instanceExtensionReceiverAndValueParameters.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, NATIVE diff --git a/compiler/testData/codegen/box/regressions/Kt1619Test.kt b/compiler/testData/codegen/box/regressions/Kt1619Test.kt index 922532e7e7d..2540b77d307 100644 --- a/compiler/testData/codegen/box/regressions/Kt1619Test.kt +++ b/compiler/testData/codegen/box/regressions/Kt1619Test.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/regressions/collections.kt b/compiler/testData/codegen/box/regressions/collections.kt index d31a1ffb188..f0f3b7a26df 100644 --- a/compiler/testData/codegen/box/regressions/collections.kt +++ b/compiler/testData/codegen/box/regressions/collections.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/regressions/getGenericInterfaces.kt b/compiler/testData/codegen/box/regressions/getGenericInterfaces.kt index c28bdadcd23..5d757d05cb5 100644 --- a/compiler/testData/codegen/box/regressions/getGenericInterfaces.kt +++ b/compiler/testData/codegen/box/regressions/getGenericInterfaces.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/specialBuiltins/bridgeNotEmptyMap.kt b/compiler/testData/codegen/box/specialBuiltins/bridgeNotEmptyMap.kt index cd795d11253..e27817a9d21 100644 --- a/compiler/testData/codegen/box/specialBuiltins/bridgeNotEmptyMap.kt +++ b/compiler/testData/codegen/box/specialBuiltins/bridgeNotEmptyMap.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS private object NotEmptyMap : MutableMap { diff --git a/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt b/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt index be88fd416e1..0566ea1c8c1 100644 --- a/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt +++ b/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM class A1 : MutableCollection { diff --git a/compiler/testData/codegen/box/specialBuiltins/notEmptyListAny.kt b/compiler/testData/codegen/box/specialBuiltins/notEmptyListAny.kt index b4b92fc7204..13a48552445 100644 --- a/compiler/testData/codegen/box/specialBuiltins/notEmptyListAny.kt +++ b/compiler/testData/codegen/box/specialBuiltins/notEmptyListAny.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS private object NotEmptyList : MutableList { diff --git a/compiler/testData/codegen/box/specialBuiltins/notEmptyMap.kt b/compiler/testData/codegen/box/specialBuiltins/notEmptyMap.kt index a0233fd92c3..f802e37674f 100644 --- a/compiler/testData/codegen/box/specialBuiltins/notEmptyMap.kt +++ b/compiler/testData/codegen/box/specialBuiltins/notEmptyMap.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS private object NotEmptyMap : MutableMap { diff --git a/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt b/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt index 86113cda4ee..b4d06baa10b 100644 --- a/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt +++ b/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // FULL_JDK diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt index ac416b2172d..e3ef1d808f9 100644 --- a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt +++ b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME diff --git a/compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt b/compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt index 4fca5e1c9f7..335d8c53205 100644 --- a/compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt +++ b/compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/when/stringOptimization/temporaryVarInWhenByStringIsDisposedProperly.kt b/compiler/testData/codegen/box/when/stringOptimization/temporaryVarInWhenByStringIsDisposedProperly.kt index b024f818fec..b452b5a85d6 100644 --- a/compiler/testData/codegen/box/when/stringOptimization/temporaryVarInWhenByStringIsDisposedProperly.kt +++ b/compiler/testData/codegen/box/when/stringOptimization/temporaryVarInWhenByStringIsDisposedProperly.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt index 125f087574a..bd634bddc9a 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt @@ -155,6 +155,8 @@ FILE fqName: fileName:/delegatedImplementation.kt PROPERTY name:z1 visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> ($this:.otherImpl., $receiver:kotlin.Byte) returnType:kotlin.Int correspondingProperty: PROPERTY name:z1 visibility:public modality:FINAL [val] + overridden: + public abstract fun (): kotlin.Int declared in .IOther $this: VALUE_PARAMETER name: type:.otherImpl. $receiver: VALUE_PARAMETER name: type:kotlin.Byte BLOCK_BODY @@ -163,6 +165,8 @@ FILE fqName: fileName:/delegatedImplementation.kt PROPERTY name:z2 visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> ($this:.otherImpl., $receiver:kotlin.Byte) returnType:kotlin.Int correspondingProperty: PROPERTY name:z2 visibility:public modality:FINAL [var] + overridden: + public abstract fun (): kotlin.Int declared in .IOther $this: VALUE_PARAMETER name: type:.otherImpl. $receiver: VALUE_PARAMETER name: type:kotlin.Byte BLOCK_BODY @@ -170,6 +174,8 @@ FILE fqName: fileName:/delegatedImplementation.kt CONST Int type=kotlin.Int value=2 FUN name: visibility:public modality:FINAL <> ($this:.otherImpl., $receiver:kotlin.Byte, value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:z2 visibility:public modality:FINAL [var] + overridden: + public abstract fun (: kotlin.Int): kotlin.Unit declared in .IOther $this: VALUE_PARAMETER name: type:.otherImpl. $receiver: VALUE_PARAMETER name: type:kotlin.Byte VALUE_PARAMETER name:value index:0 type:kotlin.Int diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt index d6a6f1d37ff..8b0a5db9427 100644 --- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt +++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt @@ -68,6 +68,9 @@ FILE fqName: fileName:/qualifiedSuperCalls.kt PROPERTY name:bar visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> ($this:.CBoth) returnType:kotlin.Int correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [val] + overridden: + public open fun (): kotlin.Int declared in .ILeft + public open fun (): kotlin.Int declared in .IRight $this: VALUE_PARAMETER name: type:.CBoth BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .CBoth' diff --git a/compiler/testData/ir/irText/classes/superCalls.fir.txt b/compiler/testData/ir/irText/classes/superCalls.fir.txt index 14086d8c7bd..0e2925da2d6 100644 --- a/compiler/testData/ir/irText/classes/superCalls.fir.txt +++ b/compiler/testData/ir/irText/classes/superCalls.fir.txt @@ -50,6 +50,8 @@ FILE fqName: fileName:/superCalls.kt PROPERTY name:bar visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> ($this:.Derived) returnType:kotlin.String correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [val] + overridden: + public open fun (): kotlin.String declared in .Base $this: VALUE_PARAMETER name: type:.Derived BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Derived' diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt index 71a213278fe..f13a5225068 100644 --- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt +++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt @@ -45,6 +45,8 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt PROPERTY name:exn visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL ($this:.Derived1.Derived1>, $receiver:Z of .Derived1.) returnType:T of .Derived1 correspondingProperty: PROPERTY name:exn visibility:public modality:FINAL [var] + overridden: + public abstract fun (): T of .Base declared in .Base TYPE_PARAMETER name:Z index:0 variance: superTypes:[kotlin.Any?] $this: VALUE_PARAMETER name: type:.Derived1.Derived1> $receiver: VALUE_PARAMETER name: type:Z of .Derived1. @@ -54,6 +56,8 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt $this: GET_VAR ': .Derived1.Derived1> declared in .Derived1.' type=.Derived1.Derived1> origin=null FUN name: visibility:public modality:FINAL ($this:.Derived1.Derived1>, $receiver:Z of .Derived1., value:T of .Derived1) returnType:kotlin.Unit correspondingProperty: PROPERTY name:exn visibility:public modality:FINAL [var] + overridden: + public abstract fun (: T of .Base): kotlin.Unit declared in .Base TYPE_PARAMETER name:Z index:0 variance: superTypes:[kotlin.Any?] $this: VALUE_PARAMETER name: type:.Derived1.Derived1> $receiver: VALUE_PARAMETER name: type:Z of .Derived1. diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt index 879a1f4cfe3..a7d10c2f3d6 100644 --- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.txt @@ -11,6 +11,8 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt PROPERTY name:size visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> ($this:.MySet) returnType:kotlin.Int correspondingProperty: PROPERTY name:size visibility:public modality:FINAL [val] + overridden: + public abstract fun (): kotlin.Int declared in kotlin.collections.Set $this: VALUE_PARAMETER name: type:.MySet BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .MySet'