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

[test] Enable linkViaSignatures based on directive, not target backend

Browse Source 
We want to be able to use signature-based linkage in other kinds
of tests.
This commit is contained in:
Sergej Jaskiewicz
2023-05-04 18:57:34 +02:00
committed by Space Team
parent 68a68b2763
commit 71c66cdb01
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
+3 -2
View File
@@ -278,6 +278,7 @@ open class FirFrontendFacade(
val sessionProvider = moduleInfoProvider.firSessionProvider val sessionProvider = moduleInfoProvider.firSessionProvider
val project = compilerConfigurationProvider.getProject(module) val project = compilerConfigurationProvider.getProject(module)
val compilerConfiguration = compilerConfigurationProvider.getCompilerConfiguration(module)
PsiElementFinder.EP.getPoint(project).unregisterExtension(JavaElementFinder::class.java) PsiElementFinder.EP.getPoint(project).unregisterExtension(JavaElementFinder::class.java)
@@ -319,8 +320,8 @@ open class FirFrontendFacade(
moduleBasedSession, moduleBasedSession,
Fir2IrConfiguration( Fir2IrConfiguration(
languageVersionSettings = module.languageVersionSettings, languageVersionSettings = module.languageVersionSettings,
linkViaSignatures = module.targetBackend == TargetBackend.JVM_IR_SERIALIZE, linkViaSignatures = compilerConfiguration.getBoolean(JVMConfigurationKeys.LINK_VIA_SIGNATURES),
evaluatedConstTracker = compilerConfigurationProvider.getCompilerConfiguration(module) evaluatedConstTracker = compilerConfiguration
.putIfAbsent(CommonConfigurationKeys.EVALUATED_CONST_TRACKER, EvaluatedConstTracker.create()), .putIfAbsent(CommonConfigurationKeys.EVALUATED_CONST_TRACKER, EvaluatedConstTracker.create()),
), ),
ktFiles, ktFiles,
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt
+2
View File
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND
import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_MULTI_MODULE import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_MULTI_MODULE
import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.FirParser
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SERIALIZE_IR import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SERIALIZE_IR
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.LINK_VIA_SIGNATURES
import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.directives.configureFirParser
import org.jetbrains.kotlin.test.directives.model.ValueDirective import org.jetbrains.kotlin.test.directives.model.ValueDirective
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter
@@ -90,6 +91,7 @@ open class AbstractIrCompileKotlinAgainstInlineKotlinTest :
private fun TestConfigurationBuilder.configureForSerialization() { private fun TestConfigurationBuilder.configureForSerialization() {
defaultDirectives { defaultDirectives {
SERIALIZE_IR.with(JvmSerializeIrMode.INLINE) SERIALIZE_IR.with(JvmSerializeIrMode.INLINE)
+LINK_VIA_SIGNATURES
} }
configureIrHandlersStep { configureIrHandlersStep {