From 7b7b8fbea74174c7cd9d5a4dd503af73fc918441 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 18 Feb 2021 12:24:21 +0300 Subject: [PATCH] [Test] Filter dependent modules by source kind in creating FirModuleInfo --- .../box/annotations/javaAnnotationArrayValueNoDefault.kt | 1 - .../testData/codegen/box/annotations/javaAnnotationCall.kt | 1 - .../testData/codegen/box/annotations/javaAnnotationDefault.kt | 1 - .../annotations/javaNegativePropertyAsAnnotationParameter.kt | 1 - .../box/annotations/javaPropertyAsAnnotationParameter.kt | 1 - .../codegen/box/annotations/javaPropertyWithIntInitializer.kt | 1 - .../box/annotations/kClassMapping/arrayClassParameter.kt | 1 - .../kClassMapping/arrayClassParameterOnJavaClass.kt | 1 - .../codegen/box/annotations/kClassMapping/classParameter.kt | 1 - .../box/annotations/kClassMapping/classParameterOnJavaClass.kt | 1 - .../box/annotations/kClassMapping/varargClassParameter.kt | 1 - .../kClassMapping/varargClassParameterOnJavaClass.kt | 1 - .../box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt | 1 - .../box/compileKotlinAgainstKotlin/delegationAndAnnotations.kt | 1 - .../compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt | 1 - .../box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt | 1 - .../codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt | 1 - .../codegen/box/compileKotlinAgainstKotlin/jvmNames.kt | 1 - .../codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt | 1 - .../reflectTopLevelFunctionOtherFile.kt | 1 - .../suspendFunWithDefaultMangling.kt | 1 - .../suspendFunWithDefaultOldMangling.kt | 1 - .../typeAnnotations/implicitReturn.kt | 1 - .../codegen/box/coroutines/multiModule/inlineCrossModule.kt | 1 - .../coroutines/multiModule/inlineFunctionWithOptionalParam.kt | 1 - .../codegen/box/coroutines/multiModule/inlineMultiModule.kt | 1 - .../box/coroutines/multiModule/inlineMultiModuleOverride.kt | 1 - .../coroutines/multiModule/inlineMultiModuleWithController.kt | 1 - .../multiModule/inlineMultiModuleWithInnerInlining.kt | 1 - .../codegen/box/coroutines/multiModule/inlineTailCall.kt | 1 - .../codegen/box/coroutines/multiModule/inlineWithJava.kt | 1 - compiler/testData/codegen/box/coroutines/multiModule/simple.kt | 1 - .../codegen/box/ir/serializationRegressions/genericProperty.kt | 1 - compiler/testData/codegen/box/multifileClasses/metadataFlag.kt | 3 --- .../testData/codegen/box/multiplatform/optionalExpectation.kt | 1 + .../codegen/box/properties/genericPropertyMultiModule.kt | 1 - compiler/testData/codegen/box/recursiveRawTypes/kt16639.kt | 1 - .../testData/codegen/box/reflection/mapping/jClass2kClass.kt | 1 - .../testData/codegen/box/reflection/mapping/javaConstructor.kt | 1 - compiler/testData/codegen/box/reflection/mapping/javaFields.kt | 1 - compiler/testData/codegen/box/sam/adapters/implementAdapter.kt | 1 - compiler/testData/codegen/box/sam/differentFqNames.kt | 1 - compiler/testData/codegen/box/sam/kt11696.kt | 1 - .../testData/codegen/box/sam/samConstructorGenericSignature.kt | 1 - .../codegen/box/throws/delegationAndThrows_AgainstCompiled.kt | 1 - .../kotlin/test/frontend/fir/FirModuleInfoProvider.kt | 3 ++- 46 files changed, 3 insertions(+), 47 deletions(-) diff --git a/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueNoDefault.kt b/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueNoDefault.kt index 8412a95d6b1..38573369acd 100644 --- a/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueNoDefault.kt +++ b/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueNoDefault.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/javaAnnotationCall.kt b/compiler/testData/codegen/box/annotations/javaAnnotationCall.kt index 620fcc14ad8..d5edf29db14 100644 --- a/compiler/testData/codegen/box/annotations/javaAnnotationCall.kt +++ b/compiler/testData/codegen/box/annotations/javaAnnotationCall.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/javaAnnotationDefault.kt b/compiler/testData/codegen/box/annotations/javaAnnotationDefault.kt index ae1bc8260d8..764350a4992 100644 --- a/compiler/testData/codegen/box/annotations/javaAnnotationDefault.kt +++ b/compiler/testData/codegen/box/annotations/javaAnnotationDefault.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt b/compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt index bddcd66f575..4ae868f6530 100644 --- a/compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt +++ b/compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/javaPropertyAsAnnotationParameter.kt b/compiler/testData/codegen/box/annotations/javaPropertyAsAnnotationParameter.kt index 3331356ff42..5ddb739e548 100644 --- a/compiler/testData/codegen/box/annotations/javaPropertyAsAnnotationParameter.kt +++ b/compiler/testData/codegen/box/annotations/javaPropertyAsAnnotationParameter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/javaPropertyWithIntInitializer.kt b/compiler/testData/codegen/box/annotations/javaPropertyWithIntInitializer.kt index 94c94183b80..fb2096625a0 100644 --- a/compiler/testData/codegen/box/annotations/javaPropertyWithIntInitializer.kt +++ b/compiler/testData/codegen/box/annotations/javaPropertyWithIntInitializer.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameter.kt b/compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameter.kt index ce69c8df11b..fe64d65d06d 100644 --- a/compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameter.kt +++ b/compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt b/compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt index 480b5b7f321..e0e376ddbb4 100644 --- a/compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt +++ b/compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/kClassMapping/classParameter.kt b/compiler/testData/codegen/box/annotations/kClassMapping/classParameter.kt index e8d0dca4c84..1b253eb0740 100644 --- a/compiler/testData/codegen/box/annotations/kClassMapping/classParameter.kt +++ b/compiler/testData/codegen/box/annotations/kClassMapping/classParameter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/kClassMapping/classParameterOnJavaClass.kt b/compiler/testData/codegen/box/annotations/kClassMapping/classParameterOnJavaClass.kt index 639c7790d9a..cd348ae401e 100644 --- a/compiler/testData/codegen/box/annotations/kClassMapping/classParameterOnJavaClass.kt +++ b/compiler/testData/codegen/box/annotations/kClassMapping/classParameterOnJavaClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameter.kt b/compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameter.kt index ee81b20d4cf..5636c0c879f 100644 --- a/compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameter.kt +++ b/compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameterOnJavaClass.kt b/compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameterOnJavaClass.kt index 7b2deaac2ec..3927f0d157b 100644 --- a/compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameterOnJavaClass.kt +++ b/compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameterOnJavaClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt index 6d64ff59d17..ff70b6dd8f5 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_STDLIB diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegationAndAnnotations.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegationAndAnnotations.kt index fb606a0f1ac..87a454e40a7 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegationAndAnnotations.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegationAndAnnotations.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt index e7e1c121860..cf2f845ac6c 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // MODULE: lib // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt index 3b1e8a45766..910f0ed7fad 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // !LANGUAGE: +InlineClasses // WITH_STDLIB diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt index 29ea554b454..f839f1cf208 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_STDLIB diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt index f6e9815858a..cb482e0d566 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_STDLIB // WITH_REFLECT diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt index 948af9ada40..33545618f77 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_STDLIB // FULL_JDK diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/reflectTopLevelFunctionOtherFile.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/reflectTopLevelFunctionOtherFile.kt index b021228d93a..84946ee5c2f 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/reflectTopLevelFunctionOtherFile.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/reflectTopLevelFunctionOtherFile.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt index a58fa376dbf..b3fd679c0bb 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // !LANGUAGE: +InlineClasses // WITH_STDLIB diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt index c531356ccb0..0b1d290a87e 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// IGNORE_BACKEND_FIR: JVM_IR // !LANGUAGE: +InlineClasses // WITH_STDLIB // MODULE: lib diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt index a3810a8b2bc..7ed00621e62 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // EMIT_JVM_TYPE_ANNOTATIONS // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt index 606a4962d8b..df7775d29c0 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: NATIVE // WITH_COROUTINES // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt index b8b2597b182..25c060efb0a 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_COROUTINES // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt index aa5cba02e90..285dae7d44e 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_COROUTINES // WITH_RUNTIME // MODULE: lib(support) diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt index 0861a7eb94f..8d689cd45e5 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_COROUTINES // WITH_RUNTIME // MODULE: lib(support) diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt index 9fb4eb91f2d..736540d70a3 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_COROUTINES // WITH_RUNTIME // MODULE: lib(support) diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt index c5b823bf671..99501074f46 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: NATIVE // WITH_COROUTINES // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt index 2b1b648811b..a66518f6dff 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt index aa7c820ff98..733f95a6f2d 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_COROUTINES // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/multiModule/simple.kt b/compiler/testData/codegen/box/coroutines/multiModule/simple.kt index f5a4ad9f5c5..0a2c2596937 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/simple.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/simple.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // MODULE: controller(support) diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt b/compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt index f246433635c..93d92e76267 100644 --- a/compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt +++ b/compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // WASM_MUTE_REASON: PROPERTY_REFERENCES // IGNORE_BACKEND: NATIVE diff --git a/compiler/testData/codegen/box/multifileClasses/metadataFlag.kt b/compiler/testData/codegen/box/multifileClasses/metadataFlag.kt index 7e0ee954544..a870f178729 100644 --- a/compiler/testData/codegen/box/multifileClasses/metadataFlag.kt +++ b/compiler/testData/codegen/box/multifileClasses/metadataFlag.kt @@ -1,9 +1,6 @@ // TARGET_BACKEND: JVM // WITH_RUNTIME -// FIR reports unresolved reference on `extraInt`. -// IGNORE_BACKEND_FIR: JVM_IR - // MODULE: optimized // !INHERIT_MULTIFILE_PARTS // FILE: optimized.kt diff --git a/compiler/testData/codegen/box/multiplatform/optionalExpectation.kt b/compiler/testData/codegen/box/multiplatform/optionalExpectation.kt index 91d1f7864b7..16701c85c52 100644 --- a/compiler/testData/codegen/box/multiplatform/optionalExpectation.kt +++ b/compiler/testData/codegen/box/multiplatform/optionalExpectation.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND_FIR: JVM_IR // !LANGUAGE: +MultiPlatformProjects // !USE_EXPERIMENTAL: kotlin.ExperimentalMultiplatform // IGNORE_BACKEND: NATIVE diff --git a/compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt b/compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt index e207a31b16a..f97b4aa6ed3 100644 --- a/compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt +++ b/compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // WASM_MUTE_REASON: PROPERTY_REFERENCES // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/recursiveRawTypes/kt16639.kt b/compiler/testData/codegen/box/recursiveRawTypes/kt16639.kt index 771fa8e60de..6644dea2e68 100644 --- a/compiler/testData/codegen/box/recursiveRawTypes/kt16639.kt +++ b/compiler/testData/codegen/box/recursiveRawTypes/kt16639.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/reflection/mapping/jClass2kClass.kt b/compiler/testData/codegen/box/reflection/mapping/jClass2kClass.kt index 6db31bd6c13..4cd579de10c 100644 --- a/compiler/testData/codegen/box/reflection/mapping/jClass2kClass.kt +++ b/compiler/testData/codegen/box/reflection/mapping/jClass2kClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/reflection/mapping/javaConstructor.kt b/compiler/testData/codegen/box/reflection/mapping/javaConstructor.kt index bb18df44566..16295a70613 100644 --- a/compiler/testData/codegen/box/reflection/mapping/javaConstructor.kt +++ b/compiler/testData/codegen/box/reflection/mapping/javaConstructor.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT // MODULE: lib diff --git a/compiler/testData/codegen/box/reflection/mapping/javaFields.kt b/compiler/testData/codegen/box/reflection/mapping/javaFields.kt index f5eda2640d4..7e78a0582d2 100644 --- a/compiler/testData/codegen/box/reflection/mapping/javaFields.kt +++ b/compiler/testData/codegen/box/reflection/mapping/javaFields.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT // FULL_JDK diff --git a/compiler/testData/codegen/box/sam/adapters/implementAdapter.kt b/compiler/testData/codegen/box/sam/adapters/implementAdapter.kt index 9d6e02cf249..de66846c697 100644 --- a/compiler/testData/codegen/box/sam/adapters/implementAdapter.kt +++ b/compiler/testData/codegen/box/sam/adapters/implementAdapter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/sam/differentFqNames.kt b/compiler/testData/codegen/box/sam/differentFqNames.kt index a75ec7c69a1..867a4c9126c 100644 --- a/compiler/testData/codegen/box/sam/differentFqNames.kt +++ b/compiler/testData/codegen/box/sam/differentFqNames.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/testData/codegen/box/sam/kt11696.kt b/compiler/testData/codegen/box/sam/kt11696.kt index e2ca195926f..0619296d355 100644 --- a/compiler/testData/codegen/box/sam/kt11696.kt +++ b/compiler/testData/codegen/box/sam/kt11696.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // SAM_CONVERSIONS: CLASS // ^ test checks reflection for synthetic classes diff --git a/compiler/testData/codegen/box/sam/samConstructorGenericSignature.kt b/compiler/testData/codegen/box/sam/samConstructorGenericSignature.kt index 177123f353c..81c2772b4e1 100644 --- a/compiler/testData/codegen/box/sam/samConstructorGenericSignature.kt +++ b/compiler/testData/codegen/box/sam/samConstructorGenericSignature.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // SKIP_JDK6 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/throws/delegationAndThrows_AgainstCompiled.kt b/compiler/testData/codegen/box/throws/delegationAndThrows_AgainstCompiled.kt index 80104409b1d..9a8a353be1e 100644 --- a/compiler/testData/codegen/box/throws/delegationAndThrows_AgainstCompiled.kt +++ b/compiler/testData/codegen/box/throws/delegationAndThrows_AgainstCompiled.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // MODULE: lib diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt index b41a7763cf0..9cb6a93521f 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test.frontend.fir import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider import org.jetbrains.kotlin.fir.session.FirJvmModuleInfo import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.test.model.DependencyKind import org.jetbrains.kotlin.test.services.TestService import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.dependencyProvider @@ -24,7 +25,7 @@ class FirModuleInfoProvider( fun convertToFirModuleInfo(module: TestModule): FirJvmModuleInfo { return firModuleInfoByModule.getOrPut(module) { val dependencies = mutableListOf(builtinsModuleInfoForModule(module)) - module.dependencies.mapTo(dependencies) { + module.dependencies.filter { it.kind == DependencyKind.Source }.mapTo(dependencies) { convertToFirModuleInfo(testServices.dependencyProvider.getTestModule(it.moduleName)) } FirJvmModuleInfo(Name.identifier(module.name), dependencies)