fixup! [Wasm] code refactoring (KT-79357)

alex28sh · Space Team · commit 4db9f59a935c · 2025-08-04T08:44:00.000Z
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
@@ -224,8 +224,8 @@ class WasmSymbols(
     val boxIntrinsic: IrSimpleFunctionSymbol = getInternalFunction("boxIntrinsic")
     val unboxIntrinsic: IrSimpleFunctionSymbol = getInternalFunction("unboxIntrinsic")
 
-    val stringGetLiteralUTF16 = getFunction("stringLiteralUTF16", StandardNames.BUILT_INS_PACKAGE_FQ_NAME)
-    val stringGetLiteralRawByte = getFunction("stringLiteralRawByte", StandardNames.BUILT_INS_PACKAGE_FQ_NAME)
+    val stringGetLiteralUtf16 = getFunction("stringLiteralUtf16", StandardNames.BUILT_INS_PACKAGE_FQ_NAME)
+    val stringGetLiteralLatin1 = getFunction("stringLiteralLatin1", StandardNames.BUILT_INS_PACKAGE_FQ_NAME)
     val stringGetPoolSize = getInternalFunction("stringGetPoolSize")
 
     val testFun = maybeGetFunction("test", kotlinTestPackageFqName)
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/dce/WasmUsefulDeclarationProcessor.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/dce/WasmUsefulDeclarationProcessor.kt
@@ -34,11 +34,11 @@ internal class WasmUsefulDeclarationProcessor(
             is IrConstKind.Null -> expression.type.enqueueType(data, "expression type")
             is IrConstKind.String -> {
                 if ((expression.value as String).all { it.code in 0..255 }) {
-                    context.wasmSymbols.stringGetLiteralRawByte.owner
-                        .enqueue(data, "String literal intrinsic getter stringGetLiteral")
+                    context.wasmSymbols.stringGetLiteralLatin1.owner
+                        .enqueue(data, "String literal intrinsic getter stringGetLiteralLatin1")
                 } else {
-                    context.wasmSymbols.stringGetLiteralUTF16.owner
-                        .enqueue(data, "String literal intrinsic getter stringGetLiteral")
+                    context.wasmSymbols.stringGetLiteralUtf16.owner
+                        .enqueue(data, "String literal intrinsic getter stringGetLiteralUtf16")
                 }
             }
             else -> Unit
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
@@ -1152,9 +1152,7 @@ class BodyGenerator(
                 val arrayGcType = WasmImmediate.GcType(
                     wasmFileCodegenContext.referenceGcType(call.typeArguments[0]!!.getRuntimeClass(irBuiltIns).symbol)
                 )
-                val dataIdx = (call.arguments[2] as? IrConst)?.value as? Int ?: error("Data idx argument should be int")
-//                if (dataIdxIrConst.kind != IrConstKind.Int) error("")
-//                val dataIdx = dataIdxIrConst.value as Int
+                val dataIdx = (call.arguments[2] as? IrConst)?.value as? Int ?: error("An argument for dataIdx should be a compile time const with type Int")
                 body.buildDrop(location)
                 body.buildInstr(WasmOp.ARRAY_NEW_DATA, location, arrayGcType, WasmImmediate.DataIdx(dataIdx))
             }
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
@@ -626,9 +626,9 @@ fun generateConstExpression(
             body.commentGroupStart { "const string: \"$stringValue\"" }
             body.buildConstI32Symbol(literalPoolId, location)
             if (isLatin) {
-                body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralRawByte), location)
+                body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralLatin1), location)
             } else {
-                body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralUTF16), location)
+                body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralUtf16), location)
             }
             body.commentGroupEnd()
         }
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmTypeOperatorLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmTypeOperatorLowering.kt
@@ -328,6 +328,7 @@ class WasmBaseTypeOperatorTransformer(val context: WasmBackendContext) : IrEleme
             is IrCall -> {
                 val function = expression.symbol.owner
 
+                // TODO: remove after bootstrap
                 if (function.symbol == context.wasmSymbols.wasmArrayNewData) return false
 
                 val packageFragment = function.getPackageFragment()
diff --git a/libraries/stdlib/wasm/builtins/kotlin/String.kt b/libraries/stdlib/wasm/builtins/kotlin/String.kt
@@ -157,7 +157,7 @@ public actual class String internal @WasmPrimitiveConstructor constructor(
 internal inline fun WasmCharArray.createString(): String =
     String(null, this.len(), this)
 
-internal fun stringLiteralUTF16(poolId: Int): String {
+internal fun stringLiteralUtf16(poolId: Int): String {
     val cached = stringPool[poolId]
     if (cached !== null) {
         return cached
@@ -173,7 +173,7 @@ internal fun stringLiteralUTF16(poolId: Int): String {
     return newString
 }
 
-internal fun stringLiteralRawByte(poolId: Int): String {
+internal fun stringLiteralLatin1(poolId: Int): String {
     val cached = stringPool[poolId]
     if (cached !== null) {
         return cached
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/TypeInfo.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/TypeInfo.kt
@@ -58,25 +58,21 @@ internal fun getQualifiedName(rtti: kotlin.wasm.internal.reftypes.structref): St
     return if (packageName.isEmpty()) typeName else "$packageName.$typeName"
 }
 
-internal fun getPackageName(rtti: kotlin.wasm.internal.reftypes.structref): String =
-    if ((wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_FITS_ONE_BIT_QUALIFIER) != 0)
-        stringLiteralRawByte(
-            poolId = wasmGetRttiIntField(2, rtti),
-        )
+internal fun getPackageName(rtti: kotlin.wasm.internal.reftypes.structref): String {
+    val flagFitsOneBitQualifier = wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_FITS_ONE_BIT_QUALIFIER
+    return if (flagFitsOneBitQualifier != 0)
+        stringLiteralLatin1(wasmGetRttiIntField(2, rtti))
     else
-        stringLiteralUTF16(
-            poolId = wasmGetRttiIntField(2, rtti),
-        )
-
-internal fun getSimpleName(rtti: kotlin.wasm.internal.reftypes.structref): String =
-    if ((wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_FITS_ONE_BIT_SIMPLE_NAME) != 0)
-        stringLiteralRawByte(
-            poolId = wasmGetRttiIntField(3, rtti),
-        )
+        stringLiteralUtf16(wasmGetRttiIntField(2, rtti))
+}
+
+internal fun getSimpleName(rtti: kotlin.wasm.internal.reftypes.structref): String {
+    val flagFitsOneBitSimpleName = wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_FITS_ONE_BIT_SIMPLE_NAME
+    return if (flagFitsOneBitSimpleName != 0)
+        stringLiteralLatin1(wasmGetRttiIntField(3, rtti))
     else
-        stringLiteralUTF16(
-            poolId = wasmGetRttiIntField(3, rtti),
-        )
+        stringLiteralUtf16(wasmGetRttiIntField(3, rtti))
+}
 
 internal fun getTypeId(rtti: kotlin.wasm.internal.reftypes.structref): Long =
     wasmGetRttiLongField(4, rtti)
diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmNewData.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/WasmNewData.kt
@@ -5,7 +5,7 @@
 
 package kotlin.wasm.internal
 
-// TODO: move to WasmInstructions and remove upper bound and implemntation
+// TODO: move to WasmInstructions and remove upper bound and implementation, see a version below.
 @Suppress("warnings")
 internal fun <T : WasmLongArray> array_new_data(address: Int, length: Int, dataIdx: Int): T {
     return WasmLongArray(0) as T

Original file line number	Diff line number	Diff line change
`@@ -1152,9 +1152,7 @@ class BodyGenerator(`
`1152`	`1152`	`val arrayGcType = WasmImmediate.GcType(`
`1153`	`1153`	`wasmFileCodegenContext.referenceGcType(call.typeArguments[0]!!.getRuntimeClass(irBuiltIns).symbol)`
`1154`	`1154`	`)`
`1155`		`- val dataIdx = (call.arguments[2] as? IrConst)?.value as? Int ?: error("Data idx argument should be int")`
`1156`		`-// if (dataIdxIrConst.kind != IrConstKind.Int) error("")`
`1157`		`-// val dataIdx = dataIdxIrConst.value as Int`
	`1155`	`+ val dataIdx = (call.arguments[2] as? IrConst)?.value as? Int ?: error("An argument for dataIdx should be a compile time const with type Int")`
`1158`	`1156`	`body.buildDrop(location)`
`1159`	`1157`	`body.buildInstr(WasmOp.ARRAY_NEW_DATA, location, arrayGcType, WasmImmediate.DataIdx(dataIdx))`
`1160`	`1158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -626,9 +626,9 @@ fun generateConstExpression(`
`626`	`626`	`body.commentGroupStart { "const string: \"$stringValue\"" }`
`627`	`627`	`body.buildConstI32Symbol(literalPoolId, location)`
`628`	`628`	`if (isLatin) {`
`629`		`- body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralRawByte), location)`
	`629`	`+ body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralLatin1), location)`
`630`	`630`	`} else {`
`631`		`- body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralUTF16), location)`
	`631`	`+ body.buildCall(context.referenceFunction(backendContext.wasmSymbols.stringGetLiteralUtf16), location)`
`632`	`632`	`}`
`633`	`633`	`body.commentGroupEnd()`
`634`	`634`	`}`