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

[PL] Commonize Native & JS compiler configuration keys

Browse Source
This commit is contained in:
Dmitriy Dolovov
2023-03-20 12:45:00 +01:00
committed by Space Team
parent 831611d577
commit a450866db3
14 changed files with 70 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java
-7
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.js.config;
import org.jetbrains.kotlin.konan.file.ZipFileSystemAccessor;
import org.jetbrains.kotlin.config.CompilerConfigurationKey;
import org.jetbrains.kotlin.config.PartialLinkageLogLevel;
import org.jetbrains.kotlin.incremental.js.IncrementalNextRoundChecker;
import org.jetbrains.kotlin.incremental.js.IncrementalDataProvider;
import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer;
@@ -101,12 +100,6 @@ public class JSConfigurationKeys {
public static final CompilerConfigurationKey<ErrorTolerancePolicy> ERROR_TOLERANCE_POLICY =
CompilerConfigurationKey.create("set up policy to ignore compilation errors");
public static final CompilerConfigurationKey<Boolean> PARTIAL_LINKAGE =
CompilerConfigurationKey.create("enables partial linkage mode");
public static final CompilerConfigurationKey<PartialLinkageLogLevel> PARTIAL_LINKAGE_LOG_LEVEL =
CompilerConfigurationKey.create("partial linkage compile-time log level");
public static final CompilerConfigurationKey<Boolean> PROPERTY_LAZY_INITIALIZATION =
CompilerConfigurationKey.create("perform lazy initialization for properties");
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsPartialLinkageTestCase.kt
+4 -1
View File
@@ -33,6 +33,9 @@ import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransf
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.TranslationMode
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImplForJsIC
import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageConfig
import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageLogLevel
import org.jetbrains.kotlin.ir.linkage.partial.setupPartialLinkageConfig
import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.js.config.JSConfigurationKeys
import org.jetbrains.kotlin.js.testOld.V8IrJsTestChecker
@@ -86,7 +89,6 @@ abstract class AbstractJsPartialLinkageTestCase(val compilerType: CompilerType)
private fun createConfig(moduleName: String): CompilerConfiguration {
val config = environment.configuration.copy()
config.put(CommonConfigurationKeys.MODULE_NAME, moduleName)
config.put(JSConfigurationKeys.PARTIAL_LINKAGE, true)
config.put(JSConfigurationKeys.MODULE_KIND, ModuleKind.PLAIN)
config.put(JSConfigurationKeys.PROPERTY_LAZY_INITIALIZATION, true)
@@ -233,6 +235,7 @@ abstract class AbstractJsPartialLinkageTestCase(val compilerType: CompilerType)
private fun buildBinaryAndRun(mainModuleKlibFile: File, allDependencies: Dependencies) {
val configuration = createConfig(MAIN_MODULE_NAME)
configuration.setupPartialLinkageConfig(PartialLinkageConfig(isEnabled = true, logLevel = PartialLinkageLogLevel.WARNING))
val compilationOutputs = when (compilerType) {
CompilerType.K1_NO_IC, CompilerType.K2_NO_IC -> buildBinaryNoIC(configuration, mainModuleKlibFile, allDependencies)