[Wasm] Add wasm target to Klib manifest
^KT-66327 fixed
This commit is contained in:
committed by
Space Team
parent
5ea6f20192
commit
b157a8eae5
@@ -47,6 +47,7 @@ import org.jetbrains.kotlin.js.analyze.AbstractTopDownAnalyzerFacadeForWeb
|
||||
import org.jetbrains.kotlin.js.analyzer.JsAnalysisResult
|
||||
import org.jetbrains.kotlin.js.config.ErrorTolerancePolicy
|
||||
import org.jetbrains.kotlin.js.config.JSConfigurationKeys
|
||||
import org.jetbrains.kotlin.js.config.WasmTarget
|
||||
import org.jetbrains.kotlin.konan.properties.Properties
|
||||
import org.jetbrains.kotlin.konan.properties.propertyList
|
||||
import org.jetbrains.kotlin.library.*
|
||||
@@ -65,6 +66,7 @@ import org.jetbrains.kotlin.psi2ir.generators.TypeTranslatorImpl
|
||||
import org.jetbrains.kotlin.resolve.BindingContext
|
||||
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
||||
import org.jetbrains.kotlin.storage.StorageManager
|
||||
import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
|
||||
import org.jetbrains.kotlin.utils.DFS
|
||||
import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
|
||||
import org.jetbrains.kotlin.utils.memoryOptimizedFilter
|
||||
@@ -103,6 +105,7 @@ fun generateKLib(
|
||||
moduleFragment: IrModuleFragment,
|
||||
diagnosticReporter: DiagnosticReporter,
|
||||
builtInsPlatform: BuiltInsPlatform = BuiltInsPlatform.JS,
|
||||
wasmTarget: WasmTarget? = null,
|
||||
) {
|
||||
val configuration = depsDescriptors.compilerConfiguration
|
||||
val allDependencies = depsDescriptors.allDependencies
|
||||
@@ -122,6 +125,7 @@ fun generateKLib(
|
||||
abiVersion,
|
||||
jsOutputName,
|
||||
builtInsPlatform,
|
||||
wasmTarget,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -615,6 +619,7 @@ fun serializeModuleIntoKlib(
|
||||
abiVersion: KotlinAbiVersion,
|
||||
jsOutputName: String?,
|
||||
builtInsPlatform: BuiltInsPlatform = BuiltInsPlatform.JS,
|
||||
wasmTarget: WasmTarget? = null,
|
||||
) {
|
||||
val moduleExportedNames = moduleFragment.collectExportedNames()
|
||||
val incrementalResultsConsumer = configuration.get(JSConfigurationKeys.INCREMENTAL_RESULTS_CONSUMER)
|
||||
@@ -690,6 +695,9 @@ fun serializeModuleIntoKlib(
|
||||
if (jsOutputName != null) {
|
||||
p.setProperty(KLIB_PROPERTY_JS_OUTPUT_NAME, jsOutputName)
|
||||
}
|
||||
wasmTarget?.let {
|
||||
p.setProperty(KLIB_PROPERTY_WASM_TARGET, it.name.toLowerCaseAsciiOnly())
|
||||
}
|
||||
if (containsErrorCode) {
|
||||
p.setProperty(KLIB_PROPERTY_CONTAINS_ERROR_CODE, "true")
|
||||
}
|
||||
@@ -717,6 +725,7 @@ fun serializeModuleIntoKlib(
|
||||
const val KLIB_PROPERTY_JS_OUTPUT_NAME = "jsOutputName"
|
||||
const val KLIB_PROPERTY_SERIALIZED_IR_FILE_FINGERPRINTS = "serializedIrFileFingerprints"
|
||||
const val KLIB_PROPERTY_SERIALIZED_KLIB_FINGERPRINT = "serializedKlibFingerprint"
|
||||
const val KLIB_PROPERTY_WASM_TARGET = "wasm_target"
|
||||
|
||||
fun <SourceFile> shouldGoToNextIcRound(
|
||||
compilerConfiguration: CompilerConfiguration,
|
||||
|
||||
Reference in New Issue
Block a user