[Wasm] separate array for stringLiteral arguments (start+length) (KT-79357)

alex28sh · Space Team · commit c10718dfb033 · 2025-08-04T08:44:00.000Z
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmBackendContext.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmBackendContext.kt
@@ -80,6 +80,7 @@ class WasmBackendContext(
 
         var objectInstanceFieldInitializer: IrSimpleFunction? = null
         var stringPoolFieldInitializer: IrSimpleFunction? = null
+        var stringAddressesAndLengthsInitializer: IrSimpleFunction? = null
         var nonConstantFieldInitializer: IrSimpleFunction? = null
     }
 
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt
@@ -212,6 +212,7 @@ class WasmSymbols(
     val refCastNull = getInternalFunction("wasm_ref_cast_null")
     val wasmArrayCopy = getInternalFunction("wasm_array_copy")
     val wasmArrayNewData0 = getInternalFunction("array_new_data0")
+    val wasmArrayNewData1 = getInternalFunction("array_new_data1")
     val wasmArrayNewData0CharArray = maybeGetFunction("array_new_data0_char_array", wasmInternalFqName)
 
     val intToLong = getInternalFunction("wasm_i64_extend_i32_s")
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/dce/Dce.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/dce/Dce.kt
@@ -96,6 +96,7 @@ private fun buildRoots(modules: List<IrModuleFragment>, context: WasmBackendCont
 
     context.fileContexts.values.forEach { crossFileContext ->
         crossFileContext.stringPoolFieldInitializer?.let { add(it) }
+        crossFileContext.stringAddressesAndLengthsInitializer?.let { add(it) }
         crossFileContext.nonConstantFieldInitializer?.let { add(it) }
     }
 
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
@@ -1148,6 +1148,13 @@ class BodyGenerator(
                 body.buildInstr(WasmOp.ARRAY_NEW_DATA, location, arrayGcType, WasmImmediate.DataIdx(0))
             }
 
+            wasmSymbols.wasmArrayNewData1 -> {
+                val arrayGcType = WasmImmediate.GcType(
+                    wasmFileCodegenContext.referenceGcType(call.typeArguments[0]!!.getRuntimeClass(irBuiltIns).symbol)
+                )
+                body.buildInstr(WasmOp.ARRAY_NEW_DATA, location, arrayGcType, WasmImmediate.DataIdx(1))
+            }
+
             wasmSymbols.wasmArrayNewData0CharArray -> {
                 val arrayGcType = WasmImmediate.GcType(
                     wasmFileCodegenContext.referenceGcType(
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt
@@ -375,8 +375,8 @@ class DeclarationGenerator(
                 ""
             }
         val simpleName = klass.name.asString()
-        val (packageNameAddress, packageNamePoolId) = wasmFileCodegenContext.referenceStringLiteralAddressAndId(qualifier)
-        val (simpleNameAddress, simpleNamePoolId) = wasmFileCodegenContext.referenceStringLiteralAddressAndId(simpleName)
+        val (_, packageNamePoolId) = wasmFileCodegenContext.referenceStringLiteralAddressAndId(qualifier)
+        val (_, simpleNamePoolId) = wasmFileCodegenContext.referenceStringLiteralAddressAndId(simpleName)
 
         val location = SourceLocation.NoLocation("Create instance of rtti struct")
         val initRttiGlobal = buildWasmExpression {
@@ -387,12 +387,7 @@ class DeclarationGenerator(
                 buildRefNull(WasmHeapType.Simple.None, location)
             }
 
-            buildConstI32Symbol(packageNameAddress, location)
-            buildConstI32(qualifier.length, location)
             buildConstI32Symbol(packageNamePoolId, location)
-
-            buildConstI32Symbol(simpleNameAddress, location)
-            buildConstI32(simpleName.length, location)
             buildConstI32Symbol(simpleNamePoolId, location)
 
             buildConstI64(wasmFileCodegenContext.referenceTypeId(symbol), location)
@@ -626,12 +621,10 @@ fun generateConstExpression(
         is IrConstKind.Double -> body.buildConstF64(expression.value as Double, location)
         is IrConstKind.String -> {
             val stringValue = expression.value as String
-            val (literalAddress, literalPoolId) = context.referenceStringLiteralAddressAndId(stringValue)
+            val (_, literalPoolId) = context.referenceStringLiteralAddressAndId(stringValue)
             val isLatin = stringValue.all { it.code in 0..255 }
             body.commentGroupStart { "const string: \"$stringValue\"" }
             body.buildConstI32Symbol(literalPoolId, location)
-            body.buildConstI32Symbol(literalAddress, location)
-            body.buildConstI32(stringValue.length, location)
             if (isLatin) {
                 body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralLatin), location)
             } else {
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmCompiledModuleFragment.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmCompiledModuleFragment.kt
@@ -73,6 +73,7 @@ class WasmCompiledFileFragment(
 
     val objectInstanceFieldInitializers: MutableList<IdSignature> = mutableListOf(),
     var stringPoolFieldInitializer: IdSignature? = null,
+    var stringAddressesAndLengthsInitializer: IdSignature? = null,
     val nonConstantFieldInitializers: MutableList<IdSignature> = mutableListOf(),
 ) : IrICProgramFragment()
 
@@ -232,11 +233,11 @@ class WasmCompiledModuleFragment(
             fields = listOf(
                 WasmStructFieldDeclaration("implementedIFaceIds", WasmRefNullType(WasmHeapType.Type(WasmSymbol(wasmLongArray))), false),
                 WasmStructFieldDeclaration("superClassRtti", WasmRefNullType(WasmHeapType.Type(rttiTypeDeclarationSymbol)), false),
-                WasmStructFieldDeclaration("packageNameAddress", WasmI32, false),
-                WasmStructFieldDeclaration("packageNameLength", WasmI32, false),
+//                WasmStructFieldDeclaration("packageNameAddress", WasmI32, false),
+//                WasmStructFieldDeclaration("packageNameLength", WasmI32, false),
                 WasmStructFieldDeclaration("packageNamePoolId", WasmI32, false),
-                WasmStructFieldDeclaration("simpleNameAddress", WasmI32, false),
-                WasmStructFieldDeclaration("simpleNameLength", WasmI32, false),
+//                WasmStructFieldDeclaration("simpleNameAddress", WasmI32, false),
+//                WasmStructFieldDeclaration("simpleNameLength", WasmI32, false),
                 WasmStructFieldDeclaration("simpleNamePoolId", WasmI32, false),
                 WasmStructFieldDeclaration("klassId", WasmI64, false),
                 WasmStructFieldDeclaration("typeInfoFlag", WasmI32, false),
@@ -463,9 +464,12 @@ class WasmCompiledModuleFragment(
         val fieldInitializerFunction = WasmFunction.Defined("_fieldInitialize", WasmSymbol(parameterlessNoReturnFunctionType))
         with(WasmExpressionBuilder(fieldInitializerFunction.instructions)) {
             var stringPoolInitializer: WasmSymbol<WasmFunction>? = null
+            var stringAddressesAndLengthsInitializer: WasmSymbol<WasmFunction>? = null
             wasmCompiledFileFragments.forEach { fragment ->
                 stringPoolInitializer = stringPoolInitializer
                     ?: fragment.stringPoolFieldInitializer?.let { WasmSymbol(fragment.functions.defined[it]) }
+                stringAddressesAndLengthsInitializer = stringAddressesAndLengthsInitializer
+                    ?: fragment.stringAddressesAndLengthsInitializer?.let { WasmSymbol(fragment.functions.defined[it]) }
 
                 fragment.objectInstanceFieldInitializers.forEach { objectInitializer ->
                     val functionSymbol = WasmSymbol(fragment.functions.defined[objectInitializer]!!)
@@ -483,6 +487,11 @@ class WasmCompiledModuleFragment(
                 }
             }
 
+            stringAddressesAndLengthsInitializer ?: compilationException("stringAddressesAndLengths initializer not found!", type = null)
+            expression.add(
+                0,
+                WasmInstrWithoutLocation(WasmOp.CALL, listOf(WasmImmediate.FuncIdx(stringAddressesAndLengthsInitializer)))
+            )
             stringPoolInitializer ?: compilationException("stringPool initializer not found!", type = null)
             expression.add(
                 0,
@@ -543,6 +552,7 @@ class WasmCompiledModuleFragment(
         val stringDataSectionBytes = mutableListOf<Byte>()
         var stringDataSectionStart = 0
         val stringAddressAndId = mutableMapOf<String, Pair<Int, Int>>()
+        val addressesAndLengths = mutableListOf<Long>()
         wasmCompiledFileFragments.forEach { fragment ->
             for ((string, literalAddressSymbol) in fragment.stringLiteralAddress.unbound) {
                 val currentStringAddress: Int
@@ -552,6 +562,7 @@ class WasmCompiledModuleFragment(
                     currentStringAddress = stringDataSectionStart
                     currentStringId = stringAddressAndId.size
                     stringAddressAndId[string] = currentStringAddress to currentStringId
+                    addressesAndLengths.add(currentStringAddress.toLong() or (string.length.toLong() shl 32))
 
                     val fitsOneByte = if (string.all { it.code in 0..255 }) 1 else 0
 
@@ -575,6 +586,8 @@ class WasmCompiledModuleFragment(
         }
 
         data.add(WasmData(WasmDataMode.Passive, stringDataSectionBytes.toByteArray()))
+        val constDataAddressesAndLengths = ConstantDataIntegerArray(addressesAndLengths, LONG_SIZE_BYTES)
+        data.add(WasmData(WasmDataMode.Passive, constDataAddressesAndLengths.toBytes()))
     }
 
     private fun bindConstantArrayDataSegmentIds(data: MutableList<WasmData>) {
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContext.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContext.kt
@@ -111,6 +111,10 @@ class WasmFileCodegenContext(
         wasmFileFragment.stringPoolFieldInitializer = initializer.getReferenceKey()
     }
 
+    fun setStringAddressesAndLengthsInitializer(initializer: IrFunctionSymbol) {
+        wasmFileFragment.stringAddressesAndLengthsInitializer = initializer.getReferenceKey()
+    }
+
     fun addNonConstantFieldInitializers(initializer: IrFunctionSymbol) {
         wasmFileFragment.nonConstantFieldInitializers.add(initializer.getReferenceKey())
     }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt
@@ -111,6 +111,9 @@ private fun compileIrFile(
     fileContext.stringPoolFieldInitializer?.apply {
         wasmFileCodegenContext.setStringPoolFieldInitializer(symbol)
     }
+    fileContext.stringAddressesAndLengthsInitializer?.apply {
+        wasmFileCodegenContext.setStringAddressesAndLengthsInitializer(symbol)
+    }
     fileContext.nonConstantFieldInitializer?.apply {
         wasmFileCodegenContext.addNonConstantFieldInitializers(symbol)
     }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/FieldInitializersLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/FieldInitializersLowering.kt
@@ -38,11 +38,13 @@ import org.jetbrains.kotlin.name.Name
  */
 class FieldInitializersLowering(val context: WasmBackendContext) : FileLoweringPass {
     private val stringPoolFqName = FqName("kotlin.wasm.internal.stringPool")
+    private val stringAddressesAndLengthsFqName = FqName("kotlin.wasm.internal.stringAddressesAndLengths")
 
     override fun lower(irFile: IrFile) {
         var nonConstantFieldInitializer: IrSimpleFunction? = null
         var objectInstanceFieldInitializer: IrSimpleFunction? = null
         var stringPoolFieldInitializer: IrSimpleFunction? = null
+        var stringAddressesAndLengthsInitializer: IrSimpleFunction? = null
 
         irFile.acceptVoid(object : IrVisitorVoid() {
             override fun visitElement(element: IrElement) {
@@ -84,6 +86,7 @@ class FieldInitializersLowering(val context: WasmBackendContext) : FileLoweringP
                 val initializeFunction = when {
                     declaration.isObjectInstanceField() -> objectInstanceFieldInitializer
                     declaration.fqNameWhenAvailable == stringPoolFqName -> stringPoolFieldInitializer
+                    declaration.fqNameWhenAvailable == stringAddressesAndLengthsFqName -> stringAddressesAndLengthsInitializer
                     else -> nonConstantFieldInitializer
                 }
 
@@ -94,6 +97,7 @@ class FieldInitializersLowering(val context: WasmBackendContext) : FileLoweringP
                         when {
                             declaration.isObjectInstanceField() -> objectInstanceFieldInitializer = it
                             declaration.fqNameWhenAvailable == stringPoolFqName -> stringPoolFieldInitializer = it
+                            declaration.fqNameWhenAvailable == stringAddressesAndLengthsFqName -> stringAddressesAndLengthsInitializer = it
                             else -> nonConstantFieldInitializer = it
                         }
                     }
@@ -111,10 +115,11 @@ class FieldInitializersLowering(val context: WasmBackendContext) : FileLoweringP
             }
         })
 
-        if (objectInstanceFieldInitializer != null || stringPoolFieldInitializer != null || nonConstantFieldInitializer != null) {
+        if (objectInstanceFieldInitializer != null || stringPoolFieldInitializer != null || nonConstantFieldInitializer != null || stringAddressesAndLengthsInitializer != null) {
             with(context.getFileContext(irFile)) {
                 this.objectInstanceFieldInitializer = objectInstanceFieldInitializer?.also { irFile.declarations.add(it) }
                 this.stringPoolFieldInitializer = stringPoolFieldInitializer?.also { irFile.declarations.add(it) }
+                this.stringAddressesAndLengthsInitializer = stringAddressesAndLengthsInitializer?.also { irFile.declarations.add(it) }
                 this.nonConstantFieldInitializer = nonConstantFieldInitializer?.also { irFile.declarations.add(it) }
             }
         }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/serialization/WasmDeserializer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/serialization/WasmDeserializer.kt
@@ -612,6 +612,7 @@ class WasmDeserializer(inputStream: InputStream, private val skipLocalNames: Boo
         rttiElements = deserializeRttiElements(),
         objectInstanceFieldInitializers = deserializeList(::deserializeIdSignature),
         stringPoolFieldInitializer = deserializeNullable(::deserializeIdSignature),
+        stringAddressesAndLengthsInitializer = deserializeNullable(::deserializeIdSignature),
         nonConstantFieldInitializers = deserializeList(::deserializeIdSignature),
     )
 
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/serialization/WasmSerializer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/serialization/WasmSerializer.kt
@@ -633,6 +633,7 @@ class WasmSerializer(outputStream: OutputStream) {
             serializeNullable(rttiElements, ::serializeRttiElements)
             serializeList(objectInstanceFieldInitializers, ::serializeIdSignature)
             serializeNullable(stringPoolFieldInitializer, ::serializeIdSignature)
+            serializeNullable(stringAddressesAndLengthsInitializer, ::serializeIdSignature)
             serializeList(nonConstantFieldInitializers, ::serializeIdSignature)
         }
 
diff --git a/libraries/stdlib/wasm/builtins/kotlin/String.kt b/libraries/stdlib/wasm/builtins/kotlin/String.kt
@@ -157,24 +157,32 @@ public actual class String internal @WasmPrimitiveConstructor constructor(
 internal inline fun WasmCharArray.createString(): String =
     String(null, this.len(), this)
 
-internal fun stringLiteralUTF16(poolId: Int, startAddress: Int, length: Int): String {
+internal fun stringLiteralUTF16(poolId: Int): String {
     val cached = stringPool[poolId]
     if (cached !== null) {
         return cached
     }
 
+    val addressAndLength = stringAddressesAndLengths.get(poolId)
+    val length = (addressAndLength shr 32).toInt()
+    val startAddress = (addressAndLength and ((1L shl 32) - 1L)).toInt()
+
     val chars = array_new_data0<WasmCharArray>(startAddress, length)
     val newString = String(null, length, chars)
     stringPool[poolId] = newString
     return newString
 }
 
-internal fun stringLiteralLatin(poolId: Int, startAddress: Int, length: Int): String {
+internal fun stringLiteralLatin(poolId: Int): String {
     val cached = stringPool[poolId]
     if (cached !== null) {
         return cached
     }
 
+    val addressAndLength = stringAddressesAndLengths.get(poolId)
+    val length = (addressAndLength shr 32).toInt()
+    val startAddress = (addressAndLength and ((1L shl 32) - 1L)).toInt()
+
     val bytes = array_new_data0<WasmByteArray>(startAddress, length)
     val chars = WasmCharArray(length)
     for (i in 0..<length) {
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/Runtime.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/Runtime.kt
@@ -124,6 +124,12 @@ internal fun consumeDoubleIntoVoid(a: Double): Void =
 internal fun stringGetPoolSize(): Int =
     implementedAsIntrinsic
 
+@Suppress("DEPRECATION")
+@OptIn(ExperimentalStdlibApi::class)
+@EagerInitialization
+internal val stringAddressesAndLengths: WasmLongArray =
+    array_new_data1<WasmLongArray>(0, stringGetPoolSize())
+
 // This initializer is a special case in FieldInitializersLowering
 @Suppress("DEPRECATION")
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/TypeInfo.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/TypeInfo.kt
@@ -59,41 +59,33 @@ internal fun getQualifiedName(rtti: kotlin.wasm.internal.reftypes.structref): St
 }
 
 internal fun getPackageName(rtti: kotlin.wasm.internal.reftypes.structref): String =
-    if ((wasmGetRttiIntField(9, rtti) and TYPE_INFO_FLAG_FITS_ONE_BIT_QUALIFIER) != 0)
+    if ((wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_FITS_ONE_BIT_QUALIFIER) != 0)
         stringLiteralLatin(
-            startAddress = wasmGetRttiIntField(2, rtti),
-            length = wasmGetRttiIntField(3, rtti),
-            poolId = wasmGetRttiIntField(4, rtti),
+            poolId = wasmGetRttiIntField(2, rtti),
         )
     else
         stringLiteralUTF16(
-            startAddress = wasmGetRttiIntField(2, rtti),
-            length = wasmGetRttiIntField(3, rtti),
-            poolId = wasmGetRttiIntField(4, rtti),
+            poolId = wasmGetRttiIntField(2, rtti),
         )
 
 internal fun getSimpleName(rtti: kotlin.wasm.internal.reftypes.structref): String =
-    if ((wasmGetRttiIntField(9, rtti) and TYPE_INFO_FLAG_FITS_ONE_BIT_SIMPLE_NAME) != 0)
+    if ((wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_FITS_ONE_BIT_SIMPLE_NAME) != 0)
         stringLiteralLatin(
-            startAddress = wasmGetRttiIntField(5, rtti),
-            length = wasmGetRttiIntField(6, rtti),
-            poolId = wasmGetRttiIntField(7, rtti),
+            poolId = wasmGetRttiIntField(3, rtti),
         )
     else
         stringLiteralUTF16(
-            startAddress = wasmGetRttiIntField(5, rtti),
-            length = wasmGetRttiIntField(6, rtti),
-            poolId = wasmGetRttiIntField(7, rtti),
+            poolId = wasmGetRttiIntField(3, rtti),
         )
 
 internal fun getTypeId(rtti: kotlin.wasm.internal.reftypes.structref): Long =
-    wasmGetRttiLongField(8, rtti)
+    wasmGetRttiLongField(4, rtti)
 
 internal fun isAnonymousClass(rtti: kotlin.wasm.internal.reftypes.structref): Boolean =
-    (wasmGetRttiIntField(9, rtti) and TYPE_INFO_FLAG_ANONYMOUS_CLASS) != 0
+    (wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_ANONYMOUS_CLASS) != 0
 
 internal fun isLocalClass(rtti: kotlin.wasm.internal.reftypes.structref): Boolean =
-    (wasmGetRttiIntField(9, rtti) and TYPE_INFO_FLAG_LOCAL_CLASS) != 0
+    (wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_LOCAL_CLASS) != 0
 
 @Suppress("UNUSED_PARAMETER")
 @ExcludedFromCodegen
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmInstructions.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmInstructions.kt
@@ -32,6 +32,9 @@ internal fun <T> wasm_array_copy(destination: T, destinationIndex: Int, source:
 internal fun <T> array_new_data0(address: Int, length: Int): T =
     implementedAsIntrinsic
 
+internal fun <T> array_new_data1(address: Int, length: Int): T =
+    implementedAsIntrinsic
+
 internal fun array_new_data0_char_array(address: Int, length: Int): WasmCharArray =
     implementedAsIntrinsic
 

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ class WasmBackendContext(`
`80`	`80`
`81`	`81`	`var objectInstanceFieldInitializer: IrSimpleFunction? = null`
`82`	`82`	`var stringPoolFieldInitializer: IrSimpleFunction? = null`
	`83`	`+ var stringAddressesAndLengthsInitializer: IrSimpleFunction? = null`
`83`	`84`	`var nonConstantFieldInitializer: IrSimpleFunction? = null`
`84`	`85`	`}`
`85`	`86`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ private fun buildRoots(modules: List<IrModuleFragment>, context: WasmBackendCont`
`96`	`96`
`97`	`97`	`context.fileContexts.values.forEach { crossFileContext ->`
`98`	`98`	`crossFileContext.stringPoolFieldInitializer?.let { add(it) }`
	`99`	`+ crossFileContext.stringAddressesAndLengthsInitializer?.let { add(it) }`
`99`	`100`	`crossFileContext.nonConstantFieldInitializer?.let { add(it) }`
`100`	`101`	`}`
`101`	`102`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,10 @@ class WasmFileCodegenContext(`
`111`	`111`	`wasmFileFragment.stringPoolFieldInitializer = initializer.getReferenceKey()`
`112`	`112`	`}`
`113`	`113`
	`114`	`+ fun setStringAddressesAndLengthsInitializer(initializer: IrFunctionSymbol) {`
	`115`	`+ wasmFileFragment.stringAddressesAndLengthsInitializer = initializer.getReferenceKey()`
	`116`	`+ }`
	`117`	`+`
`114`	`118`	`fun addNonConstantFieldInitializers(initializer: IrFunctionSymbol) {`
`115`	`119`	`wasmFileFragment.nonConstantFieldInitializers.add(initializer.getReferenceKey())`
`116`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,9 @@ private fun compileIrFile(`
`111`	`111`	`fileContext.stringPoolFieldInitializer?.apply {`
`112`	`112`	`wasmFileCodegenContext.setStringPoolFieldInitializer(symbol)`
`113`	`113`	`}`
	`114`	`+ fileContext.stringAddressesAndLengthsInitializer?.apply {`
	`115`	`+ wasmFileCodegenContext.setStringAddressesAndLengthsInitializer(symbol)`
	`116`	`+ }`
`114`	`117`	`fileContext.nonConstantFieldInitializer?.apply {`
`115`	`118`	`wasmFileCodegenContext.addNonConstantFieldInitializers(symbol)`
`116`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -612,6 +612,7 @@ class WasmDeserializer(inputStream: InputStream, private val skipLocalNames: Boo`
`612`	`612`	`rttiElements = deserializeRttiElements(),`
`613`	`613`	`objectInstanceFieldInitializers = deserializeList(::deserializeIdSignature),`
`614`	`614`	`stringPoolFieldInitializer = deserializeNullable(::deserializeIdSignature),`
	`615`	`+ stringAddressesAndLengthsInitializer = deserializeNullable(::deserializeIdSignature),`
`615`	`616`	`nonConstantFieldInitializers = deserializeList(::deserializeIdSignature),`
`616`	`617`	`)`
`617`	`618`