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

[Wasm] Rename wasm initialize function

Browse Source
This commit is contained in:
Igor Yakovlev
2023-07-31 15:40:04 +02:00
committed by Zalim Bashorov
parent a29fa428b3
commit 98329f30f8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/compiler.kt
+1 -1
View File
@@ -350,7 +350,7 @@ For more information see $d{uri("https://kotl.in/wasm_help/")}.
wasmExports = wasmInstance.exports; wasmExports = wasmInstance.exports;
if (runInitializer) { if (runInitializer) {
wasmExports.__init(); wasmExports._initialize();
} }
return { instance: wasmInstance, exports: wasmExports }; return { instance: wasmInstance, exports: wasmExports };
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmCompiledModuleFragment.kt
+3 -3
View File
@@ -178,14 +178,14 @@ class WasmCompiledModuleFragment(
} }
} }
val masterInitFunctionType = WasmFunctionType(emptyList(), emptyList()) val masterInitFunctionType = WasmFunctionType(emptyList(), emptyList())
val masterInitFunction = WasmFunction.Defined("__init", WasmSymbol(masterInitFunctionType)) val masterInitFunction = WasmFunction.Defined("_initialize", WasmSymbol(masterInitFunctionType))
with(WasmIrExpressionBuilder(masterInitFunction.instructions)) { with(WasmIrExpressionBuilder(masterInitFunction.instructions)) {
initFunctions.sortedBy { it.priority }.forEach { initFunctions.sortedBy { it.priority }.forEach {
buildCall(WasmSymbol(it.function), SourceLocation.NoLocation("Generated service code")) buildCall(WasmSymbol(it.function), SourceLocation.NoLocation("Generated service code"))
} }
} }
exports += WasmExport.Function("__init", masterInitFunction) exports += WasmExport.Function("_initialize", masterInitFunction)
val typeInfoSize = currentDataSectionAddress val typeInfoSize = currentDataSectionAddress
val memorySizeInPages = (typeInfoSize / 65_536) + 1 val memorySizeInPages = (typeInfoSize / 65_536) + 1
compiler/testData/codegen/boxWasmJsInterop/imperativeWrapperUninitialised.kt
Vendored
+1 -1
View File
@@ -34,7 +34,7 @@ let { exports } = await instantiate(imports, /*runInitializer=*/false);
if (exports.getInitialized() !== 0) { if (exports.getInitialized() !== 0) {
throw "Fail1" throw "Fail1"
} }
exports.__init(); exports._initialize();
if (exports.getInitialized() !== 100) { if (exports.getInitialized() !== 100) {
throw "Fail2" throw "Fail2"
} }