diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/AbstractFir2IrNonJvmResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/AbstractFir2IrNonJvmResultsConverter.kt index ddead95ead1..6ff8aed512e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/AbstractFir2IrNonJvmResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/AbstractFir2IrNonJvmResultsConverter.kt @@ -42,7 +42,6 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.compilerConfigurationProvider import org.jetbrains.kotlin.test.services.libraryProvider -import org.jetbrains.kotlin.utils.metadataVersion abstract class AbstractFir2IrNonJvmResultsConverter( testServices: TestServices @@ -82,7 +81,7 @@ abstract class AbstractFir2IrNonJvmResultsConverter( inlineConstTracker = null, expectActualTracker = configuration[CommonConfigurationKeys.EXPECT_ACTUAL_TRACKER], allowNonCachedDeclarations = false, - useIrFakeOverrideBuilder = module.shouldUseIrFakeOverrideBuilderInConvertToIr() + useIrFakeOverrideBuilder = module.shouldUseIrFakeOverrideBuilder() ) } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt index 81e1473f33b..39426c1a595 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt @@ -99,7 +99,7 @@ class Fir2IrJvmResultsConverter( inlineConstTracker = compilerConfiguration[CommonConfigurationKeys.INLINE_CONST_TRACKER], expectActualTracker = compilerConfiguration[CommonConfigurationKeys.EXPECT_ACTUAL_TRACKER], allowNonCachedDeclarations = false, - useIrFakeOverrideBuilder = module.shouldUseIrFakeOverrideBuilderInConvertToIr(), + useIrFakeOverrideBuilder = module.shouldUseIrFakeOverrideBuilder(), ) val fir2irResult = inputArtifact.toFirResult().convertToIrAndActualize( diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt index 7633991167c..16a0dd0f3a9 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.test.frontend.fir -import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.platform.isCommon import org.jetbrains.kotlin.platform.isJs import org.jetbrains.kotlin.platform.jvm.isJvm @@ -17,13 +16,8 @@ import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices -/** - * In multi-platform projects this option is passed to IrActualizer instead - * @see [IrActualizerAndPluginsFacade] - */ -fun TestModule.shouldUseIrFakeOverrideBuilderInConvertToIr(): Boolean { - return CodegenTestDirectives.ENABLE_IR_FAKE_OVERRIDE_GENERATION in directives && - !languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects) +fun TestModule.shouldUseIrFakeOverrideBuilder(): Boolean { + return CodegenTestDirectives.ENABLE_IR_FAKE_OVERRIDE_GENERATION in directives } class Fir2IrResultsConverter(