azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Test] Fix passing useIrFakeOverrideBuilder flag in tests

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-11-22 11:38:53 +02:00
committed by Space Team
parent 039baf95fc
commit a22a254c1e
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/AbstractFir2IrNonJvmResultsConverter.kt
+1 -2
View File
@@ -42,7 +42,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.compilerConfigurationProvider import org.jetbrains.kotlin.test.services.compilerConfigurationProvider
import org.jetbrains.kotlin.test.services.libraryProvider import org.jetbrains.kotlin.test.services.libraryProvider
import org.jetbrains.kotlin.utils.metadataVersion
abstract class AbstractFir2IrNonJvmResultsConverter( abstract class AbstractFir2IrNonJvmResultsConverter(
testServices: TestServices testServices: TestServices
@@ -82,7 +81,7 @@ abstract class AbstractFir2IrNonJvmResultsConverter(
inlineConstTracker = null, inlineConstTracker = null,
expectActualTracker = configuration[CommonConfigurationKeys.EXPECT_ACTUAL_TRACKER], expectActualTracker = configuration[CommonConfigurationKeys.EXPECT_ACTUAL_TRACKER],
allowNonCachedDeclarations = false, allowNonCachedDeclarations = false,
useIrFakeOverrideBuilder = module.shouldUseIrFakeOverrideBuilderInConvertToIr() useIrFakeOverrideBuilder = module.shouldUseIrFakeOverrideBuilder()
) )
} }
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt
+1 -1
View File
@@ -99,7 +99,7 @@ class Fir2IrJvmResultsConverter(
inlineConstTracker = compilerConfiguration[CommonConfigurationKeys.INLINE_CONST_TRACKER], inlineConstTracker = compilerConfiguration[CommonConfigurationKeys.INLINE_CONST_TRACKER],
expectActualTracker = compilerConfiguration[CommonConfigurationKeys.EXPECT_ACTUAL_TRACKER], expectActualTracker = compilerConfiguration[CommonConfigurationKeys.EXPECT_ACTUAL_TRACKER],
allowNonCachedDeclarations = false, allowNonCachedDeclarations = false,
useIrFakeOverrideBuilder = module.shouldUseIrFakeOverrideBuilderInConvertToIr(), useIrFakeOverrideBuilder = module.shouldUseIrFakeOverrideBuilder(),
) )
val fir2irResult = inputArtifact.toFirResult().convertToIrAndActualize( val fir2irResult = inputArtifact.toFirResult().convertToIrAndActualize(
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt
+2 -8
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.test.frontend.fir package org.jetbrains.kotlin.test.frontend.fir
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.platform.isCommon import org.jetbrains.kotlin.platform.isCommon
import org.jetbrains.kotlin.platform.isJs import org.jetbrains.kotlin.platform.isJs
import org.jetbrains.kotlin.platform.jvm.isJvm 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.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
/** fun TestModule.shouldUseIrFakeOverrideBuilder(): Boolean {
* In multi-platform projects this option is passed to IrActualizer instead return CodegenTestDirectives.ENABLE_IR_FAKE_OVERRIDE_GENERATION in directives
* @see [IrActualizerAndPluginsFacade]
*/
fun TestModule.shouldUseIrFakeOverrideBuilderInConvertToIr(): Boolean {
return CodegenTestDirectives.ENABLE_IR_FAKE_OVERRIDE_GENERATION in directives &&
!languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects)
} }
class Fir2IrResultsConverter( class Fir2IrResultsConverter(