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

[LL API] Run fir2ir separately for files in different modules

Browse Source 
Each module may have its own compiler configuration.

^KTIJ-27061 Fixed
This commit is contained in:
Yan Zhulanow
2023-09-13 21:36:24 +09:00
committed by Space Team
parent 38a67f3d30
commit 834cbaac5a
13 changed files with 334 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/compilerFacility/AbstractCompilerFacilityTest.kt
+15 -9
View File
@@ -13,7 +13,8 @@ import org.jetbrains.kotlin.analysis.api.components.KtCompilerFacility
import org.jetbrains.kotlin.analysis.api.components.KtCompilerTarget
import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnostic
import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest
import org.jetbrains.kotlin.analysis.test.framework.project.structure.ktModuleProvider
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
@@ -36,6 +37,7 @@ import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirective
import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
import org.jetbrains.kotlin.test.services.TestModuleStructure
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions
import org.jetbrains.org.objectweb.asm.ClassReader
@@ -45,7 +47,9 @@ import org.jetbrains.org.objectweb.asm.tree.ClassNode
import java.io.File
import kotlin.test.assertFalse
abstract class AbstractCompilerFacilityTest : AbstractAnalysisApiBasedSingleModuleTest() {
abstract class AbstractMultiModuleCompilerFacilityTest : AbstractCompilerFacilityTest()
abstract class AbstractCompilerFacilityTest : AbstractAnalysisApiBasedTest() {
private companion object {
private val ALLOWED_ERRORS = listOf(
FirErrors.INVISIBLE_REFERENCE,
@@ -64,7 +68,9 @@ abstract class AbstractCompilerFacilityTest : AbstractAnalysisApiBasedSingleModu
).map { it.name }
}
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
override fun doTestByModuleStructure(moduleStructure: TestModuleStructure, testServices: TestServices) {
val mainModule = moduleStructure.modules.first { it.name == "main" }
val ktFiles = testServices.ktModuleProvider.getModuleFiles(mainModule).filterIsInstance<KtFile>()
val ktFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" }
val irCollector = CollectingIrGenerationExtension()
@@ -73,22 +79,22 @@ abstract class AbstractCompilerFacilityTest : AbstractAnalysisApiBasedSingleModu
project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
.registerExtension(irCollector, LoadingOrder.LAST, project)
val ktCodeFragment = createCodeFragment(ktFile, module, testServices)
val ktCodeFragment = createCodeFragment(ktFile, mainModule, testServices)
if (ktCodeFragment != null) {
for (importNameString in module.directives[Directives.CODE_FRAGMENT_IMPORT]) {
for (importNameString in mainModule.directives[Directives.CODE_FRAGMENT_IMPORT]) {
ktCodeFragment.addImport("import $importNameString")
}
}
val compilerConfiguration = CompilerConfiguration().apply {
put(CommonConfigurationKeys.MODULE_NAME, module.name)
put(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, module.languageVersionSettings)
put(CommonConfigurationKeys.MODULE_NAME, mainModule.name)
put(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, mainModule.languageVersionSettings)
put(JVMConfigurationKeys.IR, true)
module.directives[Directives.CODE_FRAGMENT_CLASS_NAME].singleOrNull()
mainModule.directives[Directives.CODE_FRAGMENT_CLASS_NAME].singleOrNull()
?.let { put(KtCompilerFacility.CODE_FRAGMENT_CLASS_NAME, it) }
module.directives[Directives.CODE_FRAGMENT_METHOD_NAME].singleOrNull()
mainModule.directives[Directives.CODE_FRAGMENT_METHOD_NAME].singleOrNull()
?.let { put(KtCompilerFacility.CODE_FRAGMENT_METHOD_NAME, it) }
}