diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt index 7079279f461..8d23a415a1f 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt @@ -101,6 +101,9 @@ internal class ClassMemberGenerator( for ((valueParameter, firValueParameter) in valueParameters.zip(firFunction.valueParameters)) { valueParameter.setDefaultValue(firValueParameter) } + annotations = firFunction.annotations.mapNotNull { + it.accept(visitor, null) as? IrConstructorCall + } } if (firFunction is FirConstructor && irFunction is IrConstructor && !parentAsClass.isAnnotationClass) { val body = IrBlockBodyImpl(startOffset, endOffset) diff --git a/compiler/testData/codegen/box/annotations/annotatedLambda/lambda.kt b/compiler/testData/codegen/box/annotations/annotatedLambda/lambda.kt index 6c850baaef5..0742890df6a 100644 --- a/compiler/testData/codegen/box/annotations/annotatedLambda/lambda.kt +++ b/compiler/testData/codegen/box/annotations/annotatedLambda/lambda.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt b/compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt index 69c56a31159..30311ca452c 100644 --- a/compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt +++ b/compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/external/jvmStaticExternal.kt b/compiler/testData/codegen/box/external/jvmStaticExternal.kt index bc22910e993..c46b5ce7382 100644 --- a/compiler/testData/codegen/box/external/jvmStaticExternal.kt +++ b/compiler/testData/codegen/box/external/jvmStaticExternal.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // IGNORE_BACKEND: ANDROID diff --git a/compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt b/compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt index 0e7273e2d07..9dd7d2172fb 100644 --- a/compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt +++ b/compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // IGNORE_BACKEND: ANDROID diff --git a/compiler/testData/codegen/box/inlineClasses/jvmStaticFunInInlineClassCompanion.kt b/compiler/testData/codegen/box/inlineClasses/jvmStaticFunInInlineClassCompanion.kt index e74e0f36617..9421ccb6a10 100644 --- a/compiler/testData/codegen/box/inlineClasses/jvmStaticFunInInlineClassCompanion.kt +++ b/compiler/testData/codegen/box/inlineClasses/jvmStaticFunInInlineClassCompanion.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/inlineClasses/jvmStaticPropertyAccessorInInlineClassCompanion.kt b/compiler/testData/codegen/box/inlineClasses/jvmStaticPropertyAccessorInInlineClassCompanion.kt index 5f41f99285f..23a0891dfdc 100644 --- a/compiler/testData/codegen/box/inlineClasses/jvmStaticPropertyAccessorInInlineClassCompanion.kt +++ b/compiler/testData/codegen/box/inlineClasses/jvmStaticPropertyAccessorInInlineClassCompanion.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/propertyAnnotation.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/propertyAnnotation.kt index 98a75e02878..2d21a8c9972 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/propertyAnnotation.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/propertyAnnotation.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all-compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_REFLECT diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt index f7ec9bdd9a8..511acbc6f6f 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: enable -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // IGNORE_BACKEND: ANDROID // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt index 594217fd722..f031ef38328 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.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/propertyAnnotation.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt index f1dac9b6a9e..41b0c2f71ee 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: compatibility -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_REFLECT diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt index 45b52e3bf33..f5d9c43ba3c 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.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/diamond.kt b/compiler/testData/codegen/box/jvm8/defaults/diamond.kt index a82f852c44f..2b1cb0b3082 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/diamond.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/diamond.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: enable -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // IGNORE_BACKEND: ANDROID // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt b/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt index b781c55ed60..01ab258ee0b 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: enable -// 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/propertyAnnotation.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/propertyAnnotation.kt index 661a3959804..80607422b6d 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/propertyAnnotation.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/propertyAnnotation.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: all -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_REFLECT diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt index 02f0eaa53fc..de199058d10 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: enable -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // IGNORE_BACKEND: ANDROID // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt b/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt index 77f7da70e5f..c067b8abe71 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: enable -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_REFLECT diff --git a/compiler/testData/codegen/box/jvm8/kt6301.kt b/compiler/testData/codegen/box/jvm8/kt6301.kt index 333a972be16..369a40900fb 100644 --- a/compiler/testData/codegen/box/jvm8/kt6301.kt +++ b/compiler/testData/codegen/box/jvm8/kt6301.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +JvmStaticInInterface -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvm8/kt6301_2.kt b/compiler/testData/codegen/box/jvm8/kt6301_2.kt index 6725fe72fde..935d16b2a26 100644 --- a/compiler/testData/codegen/box/jvm8/kt6301_2.kt +++ b/compiler/testData/codegen/box/jvm8/kt6301_2.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +JvmStaticInInterface -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/jvmName/clashingErasure.kt b/compiler/testData/codegen/box/jvmName/clashingErasure.kt index e45ea8f3a4e..0be13b4e3f7 100644 --- a/compiler/testData/codegen/box/jvmName/clashingErasure.kt +++ b/compiler/testData/codegen/box/jvmName/clashingErasure.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmName/loadJvmName.kt b/compiler/testData/codegen/box/jvmName/loadJvmName.kt index 593d4f9aa0f..dc094539dbf 100644 --- a/compiler/testData/codegen/box/jvmName/loadJvmName.kt +++ b/compiler/testData/codegen/box/jvmName/loadJvmName.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/companionObject.kt b/compiler/testData/codegen/box/jvmOverloads/companionObject.kt index 432e91f033f..19f29eefce3 100644 --- a/compiler/testData/codegen/box/jvmOverloads/companionObject.kt +++ b/compiler/testData/codegen/box/jvmOverloads/companionObject.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/defaultsNotAtEnd.kt b/compiler/testData/codegen/box/jvmOverloads/defaultsNotAtEnd.kt index 81d5fbaed52..a1822e439b9 100644 --- a/compiler/testData/codegen/box/jvmOverloads/defaultsNotAtEnd.kt +++ b/compiler/testData/codegen/box/jvmOverloads/defaultsNotAtEnd.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/doubleParameters.kt b/compiler/testData/codegen/box/jvmOverloads/doubleParameters.kt index 555eb2ca7d5..7b310b2800b 100644 --- a/compiler/testData/codegen/box/jvmOverloads/doubleParameters.kt +++ b/compiler/testData/codegen/box/jvmOverloads/doubleParameters.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/extensionMethod.kt b/compiler/testData/codegen/box/jvmOverloads/extensionMethod.kt index 601d5a4c304..fb455708776 100644 --- a/compiler/testData/codegen/box/jvmOverloads/extensionMethod.kt +++ b/compiler/testData/codegen/box/jvmOverloads/extensionMethod.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/generics.kt b/compiler/testData/codegen/box/jvmOverloads/generics.kt index 93b362e266d..051557cbc86 100644 --- a/compiler/testData/codegen/box/jvmOverloads/generics.kt +++ b/compiler/testData/codegen/box/jvmOverloads/generics.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/innerClass.kt b/compiler/testData/codegen/box/jvmOverloads/innerClass.kt index 2b163c0fcd3..f35285427d4 100644 --- a/compiler/testData/codegen/box/jvmOverloads/innerClass.kt +++ b/compiler/testData/codegen/box/jvmOverloads/innerClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/manyParameters.kt b/compiler/testData/codegen/box/jvmOverloads/manyParameters.kt index ce3ec161d6d..d7873a92b73 100644 --- a/compiler/testData/codegen/box/jvmOverloads/manyParameters.kt +++ b/compiler/testData/codegen/box/jvmOverloads/manyParameters.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // FILE: JavaCall.java diff --git a/compiler/testData/codegen/box/jvmOverloads/multifileClass.kt b/compiler/testData/codegen/box/jvmOverloads/multifileClass.kt index 068d793b96f..54125ce7b75 100644 --- a/compiler/testData/codegen/box/jvmOverloads/multifileClass.kt +++ b/compiler/testData/codegen/box/jvmOverloads/multifileClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // FILE: facade.kt diff --git a/compiler/testData/codegen/box/jvmOverloads/multipleDefaultParameters.kt b/compiler/testData/codegen/box/jvmOverloads/multipleDefaultParameters.kt index 9ccb13b8bab..ea14a6f69e0 100644 --- a/compiler/testData/codegen/box/jvmOverloads/multipleDefaultParameters.kt +++ b/compiler/testData/codegen/box/jvmOverloads/multipleDefaultParameters.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/noRedundantVarargs.kt b/compiler/testData/codegen/box/jvmOverloads/noRedundantVarargs.kt index b7351979727..2dbae6a3258 100644 --- a/compiler/testData/codegen/box/jvmOverloads/noRedundantVarargs.kt +++ b/compiler/testData/codegen/box/jvmOverloads/noRedundantVarargs.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // FULL_JDK diff --git a/compiler/testData/codegen/box/jvmOverloads/nonDefaultParameter.kt b/compiler/testData/codegen/box/jvmOverloads/nonDefaultParameter.kt index 47229ee2dbd..4f10810b2c0 100644 --- a/compiler/testData/codegen/box/jvmOverloads/nonDefaultParameter.kt +++ b/compiler/testData/codegen/box/jvmOverloads/nonDefaultParameter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/primaryConstructor.kt b/compiler/testData/codegen/box/jvmOverloads/primaryConstructor.kt index 4a650fbc366..07852ad5352 100644 --- a/compiler/testData/codegen/box/jvmOverloads/primaryConstructor.kt +++ b/compiler/testData/codegen/box/jvmOverloads/primaryConstructor.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/secondaryConstructor.kt b/compiler/testData/codegen/box/jvmOverloads/secondaryConstructor.kt index ad557238a95..5132e8cfd3f 100644 --- a/compiler/testData/codegen/box/jvmOverloads/secondaryConstructor.kt +++ b/compiler/testData/codegen/box/jvmOverloads/secondaryConstructor.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/simple.kt b/compiler/testData/codegen/box/jvmOverloads/simple.kt index cfcf514a8b0..f21926a8226 100644 --- a/compiler/testData/codegen/box/jvmOverloads/simple.kt +++ b/compiler/testData/codegen/box/jvmOverloads/simple.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/simpleJavaCall.kt b/compiler/testData/codegen/box/jvmOverloads/simpleJavaCall.kt index a61eb42ee7c..0dbd98255b8 100644 --- a/compiler/testData/codegen/box/jvmOverloads/simpleJavaCall.kt +++ b/compiler/testData/codegen/box/jvmOverloads/simpleJavaCall.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmOverloads/typeParameters.kt b/compiler/testData/codegen/box/jvmOverloads/typeParameters.kt index 8e9adc19f82..27c796bf37e 100644 --- a/compiler/testData/codegen/box/jvmOverloads/typeParameters.kt +++ b/compiler/testData/codegen/box/jvmOverloads/typeParameters.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmStatic/annotations.kt b/compiler/testData/codegen/box/jvmStatic/annotations.kt index 2be014408cb..2de3f5b4a09 100644 --- a/compiler/testData/codegen/box/jvmStatic/annotations.kt +++ b/compiler/testData/codegen/box/jvmStatic/annotations.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmStatic/companionObject.kt b/compiler/testData/codegen/box/jvmStatic/companionObject.kt index 4d947dbac9a..3e0d941cacf 100644 --- a/compiler/testData/codegen/box/jvmStatic/companionObject.kt +++ b/compiler/testData/codegen/box/jvmStatic/companionObject.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmStatic/interfaceCompanion.kt b/compiler/testData/codegen/box/jvmStatic/interfaceCompanion.kt index 283e332e778..134112c59cd 100644 --- a/compiler/testData/codegen/box/jvmStatic/interfaceCompanion.kt +++ b/compiler/testData/codegen/box/jvmStatic/interfaceCompanion.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +JvmStaticInInterface -// IGNORE_BACKEND_FIR: JVM_IR // JVM_TARGET: 1.8 // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/jvmStatic/object.kt b/compiler/testData/codegen/box/jvmStatic/object.kt index dd0c13fb218..ca8320b4e8c 100644 --- a/compiler/testData/codegen/box/jvmStatic/object.kt +++ b/compiler/testData/codegen/box/jvmStatic/object.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/publishedApi/noMangling.kt b/compiler/testData/codegen/box/publishedApi/noMangling.kt index d330db2bc84..1aa6627b831 100644 --- a/compiler/testData/codegen/box/publishedApi/noMangling.kt +++ b/compiler/testData/codegen/box/publishedApi/noMangling.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM //WITH_REFLECT class A { diff --git a/compiler/testData/codegen/box/reflection/annotations/privateAnnotation.kt b/compiler/testData/codegen/box/reflection/annotations/privateAnnotation.kt index 2c778c5393a..9ba8312732f 100644 --- a/compiler/testData/codegen/box/reflection/annotations/privateAnnotation.kt +++ b/compiler/testData/codegen/box/reflection/annotations/privateAnnotation.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS, NATIVE // WITH_REFLECT diff --git a/compiler/testData/codegen/box/reflection/annotations/simpleFunAnnotation.kt b/compiler/testData/codegen/box/reflection/annotations/simpleFunAnnotation.kt index 9a2d5ed6eeb..9bf7297f9b3 100644 --- a/compiler/testData/codegen/box/reflection/annotations/simpleFunAnnotation.kt +++ b/compiler/testData/codegen/box/reflection/annotations/simpleFunAnnotation.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/call/jvmStaticInObjectIncorrectReceiver.kt b/compiler/testData/codegen/box/reflection/call/jvmStaticInObjectIncorrectReceiver.kt index e878ffb9497..b507eb42ee2 100644 --- a/compiler/testData/codegen/box/reflection/call/jvmStaticInObjectIncorrectReceiver.kt +++ b/compiler/testData/codegen/box/reflection/call/jvmStaticInObjectIncorrectReceiver.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT diff --git a/compiler/testData/codegen/box/reflection/createAnnotation/equalsHashCodeToString.kt b/compiler/testData/codegen/box/reflection/createAnnotation/equalsHashCodeToString.kt index c607f9990cb..465ab646209 100644 --- a/compiler/testData/codegen/box/reflection/createAnnotation/equalsHashCodeToString.kt +++ b/compiler/testData/codegen/box/reflection/createAnnotation/equalsHashCodeToString.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/genericSignature/kt6106.kt b/compiler/testData/codegen/box/reflection/genericSignature/kt6106.kt index a300bf9fbbd..aee60642a51 100644 --- a/compiler/testData/codegen/box/reflection/genericSignature/kt6106.kt +++ b/compiler/testData/codegen/box/reflection/genericSignature/kt6106.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT diff --git a/compiler/testData/codegen/box/reflection/mapping/jvmStatic/objectFunction.kt b/compiler/testData/codegen/box/reflection/mapping/jvmStatic/objectFunction.kt index 44cc1f63298..4177fe6fcbb 100644 --- a/compiler/testData/codegen/box/reflection/mapping/jvmStatic/objectFunction.kt +++ b/compiler/testData/codegen/box/reflection/mapping/jvmStatic/objectFunction.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT diff --git a/compiler/testData/codegen/box/reflection/mapping/propertyAccessorsWithJvmName.kt b/compiler/testData/codegen/box/reflection/mapping/propertyAccessorsWithJvmName.kt index e9a2334284b..f34e60aa6e2 100644 --- a/compiler/testData/codegen/box/reflection/mapping/propertyAccessorsWithJvmName.kt +++ b/compiler/testData/codegen/box/reflection/mapping/propertyAccessorsWithJvmName.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT diff --git a/compiler/testData/codegen/box/regressions/kt1932.kt b/compiler/testData/codegen/box/regressions/kt1932.kt index 2f9dfcded13..f96f6379f4a 100644 --- a/compiler/testData/codegen/box/regressions/kt1932.kt +++ b/compiler/testData/codegen/box/regressions/kt1932.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/syntheticAccessors/jvmNameForAccessors.kt b/compiler/testData/codegen/box/syntheticAccessors/jvmNameForAccessors.kt index 48db403de55..1f91d3ae2d5 100644 --- a/compiler/testData/codegen/box/syntheticAccessors/jvmNameForAccessors.kt +++ b/compiler/testData/codegen/box/syntheticAccessors/jvmNameForAccessors.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.fir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.fir.txt index 60c53b7895d..599caaace8f 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.fir.txt @@ -44,12 +44,22 @@ FILE fqName: fileName:/annotationsWithDefaultParameterValues.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(x = 'abc', y = '123') BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(x = 'def', y = ) BLOCK_BODY FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(x = 'ghi', y = ) BLOCK_BODY FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(x = '456', y = ) BLOCK_BODY FUN name:test5 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(x = , y = ) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.fir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.fir.txt index 62a7f726b58..8237dbdddf3 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.fir.txt @@ -30,6 +30,10 @@ FILE fqName: fileName:/annotationsWithVarargParameters.kt FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(xs = 'abc') BLOCK_BODY FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(xs = ) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.fir.txt b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.fir.txt index b63020fa251..5b46815152c 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.fir.txt @@ -47,4 +47,6 @@ FILE fqName: fileName:/classLiteralInAnnotation.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(klass = CLASS_REFERENCE 'CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.C>) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.fir.txt index 1ae773de124..8c5479f3a3c 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.fir.txt @@ -37,6 +37,10 @@ FILE fqName: fileName:/constExpressionsInAnnotationArguments.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(x = CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY) BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A(x = CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.fir.txt index 99822422081..32cb7dd44ea 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.fir.txt @@ -30,10 +30,14 @@ FILE fqName: fileName:/constructorsWithAnnotations.kt CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass CONSTRUCTOR visibility:public <> () returnType:.TestClass [primary] + annotations: + TestAnn(x = '1') BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]' CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.TestClass + annotations: + TestAnn(x = '2') VALUE_PARAMETER name:x index:0 type:kotlin.Int BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .TestClass' diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt index e6e04dfd787..74c3e2fc012 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt @@ -86,4 +86,6 @@ FILE fqName: fileName:/enumsInAnnotationArguments.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + TestAnn(x = GET_ENUM 'ENUM_ENTRY name:A' type=.En) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.fir.txt index 0f81c06066d..30e62918a6d 100644 --- a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.fir.txt @@ -28,4 +28,6 @@ FILE fqName: fileName:/functionsWithAnnotations.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:testSimpleFunction visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + TestAnn(x = '42') BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.fir.txt b/compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.fir.txt index 157abdcd9f2..394a5f7591c 100644 --- a/compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.fir.txt @@ -48,4 +48,8 @@ FILE fqName: fileName:/multipleAnnotationsInSquareBrackets.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A1 + A2 + A3 BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.fir.txt index 224d3957880..3b9fc31aed6 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.fir.txt @@ -29,17 +29,23 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:test1 visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.String + annotations: + TestAnn(x = 'test1.get') correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' CONST String type=kotlin.String value="" PROPERTY name:test2 visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.String + annotations: + TestAnn(x = 'test2.get') correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' CONST String type=kotlin.String value="" FUN name: visibility:public modality:FINAL <> (value:kotlin.String) returnType:kotlin.Unit + annotations: + TestAnn(x = 'test2.set') correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.String BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.fir.txt index 9a6a121a8c8..12d1ff411bb 100644 --- a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.fir.txt @@ -86,4 +86,8 @@ FILE fqName: fileName:/varargsInAnnotationArguments.kt FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit + annotations: + A1(xs = ) + A2(xs = ) + AA(xs = ) BLOCK_BODY diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt index 45850eb8ba8..43421fbae05 100644 --- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt +++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt @@ -1,5 +1,7 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt FUN name:scopedFlow visibility:public modality:FINAL (block:kotlin.coroutines.SuspendFunction2<.CoroutineScope, .FlowCollector.scopedFlow>, kotlin.Unit>) returnType:.Flow.scopedFlow> + annotations: + OptIn(markerClass = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass) TYPE_PARAMETER name:R index:0 variance: superTypes:[kotlin.Any?] VALUE_PARAMETER name:block index:0 type:kotlin.coroutines.SuspendFunction2<.CoroutineScope, .FlowCollector.scopedFlow>, kotlin.Unit> BLOCK_BODY @@ -48,12 +50,16 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, kotlin.Throwable?, kotlin.Unit> BLOCK_BODY FUN name:unsafeFlow visibility:public modality:FINAL (block:kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit>) returnType:.Flow.unsafeFlow> [inline] + annotations: + OptIn(markerClass = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass) TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] VALUE_PARAMETER name:block index:0 type:kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit> [crossinline] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun unsafeFlow (block: kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit>): .Flow.unsafeFlow> [inline] declared in ' CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin' type=kotlin.Nothing origin=null FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:kotlin.coroutines.SuspendFunction1) returnType:IrErrorType + annotations: + Deprecated(message = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel, replaceWith = 'binary compatibility with a version w/o FlowCollector receiver', level = ) TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] $receiver: VALUE_PARAMETER name: type:.Flow.onCompletion> VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1 @@ -176,12 +182,16 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:flow visibility:public modality:FINAL (block:kotlin.coroutines.SuspendFunction1<.FlowCollector.flow>, kotlin.Unit>) returnType:.Flow.flow> + annotations: + OptIn(markerClass = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass) TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] VALUE_PARAMETER name:block index:0 type:kotlin.coroutines.SuspendFunction1<.FlowCollector.flow>, kotlin.Unit> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun flow (block: kotlin.coroutines.SuspendFunction1<.FlowCollector.flow>, kotlin.Unit>): .Flow.flow> declared in ' CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin' type=kotlin.Nothing origin=null FUN name:flowScope visibility:public modality:FINAL (block:kotlin.coroutines.SuspendFunction1<.CoroutineScope, R of .flowScope>) returnType:R of .flowScope [suspend] + annotations: + OptIn(markerClass = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass) TYPE_PARAMETER name:R index:0 variance: superTypes:[kotlin.Any?] VALUE_PARAMETER name:block index:0 type:kotlin.coroutines.SuspendFunction1<.CoroutineScope, R of .flowScope> BLOCK_BODY @@ -286,6 +296,8 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:produce visibility:public modality:FINAL ($receiver:.CoroutineScope, block:kotlin.coroutines.SuspendFunction1<.ProducerScope.produce>, kotlin.Unit>) returnType:.ReceiveChannel.produce> + annotations: + OptIn(markerClass = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass) TYPE_PARAMETER name:E index:0 variance: superTypes:[kotlin.Any?] $receiver: VALUE_PARAMETER name: type:.CoroutineScope VALUE_PARAMETER name:block index:0 type:kotlin.coroutines.SuspendFunction1<.ProducerScope.produce>, kotlin.Unit>