[Wasm] Temporarily return old versions of some runtime functions and call them when wasmAbiVersion is < 1

Author: bashor

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt

@@ -1556,7 +1556,7 @@ class BodyGenerator(
     }
 
     companion object {
-        val wasmAbiVersion = WasmSymbol(0)
+        val wasmAbiVersion = WasmSymbol(1)
         val anyVtableFieldId = WasmSymbol(0)
         val anyITableFieldId = WasmSymbol(1)
         val anyRttiFieldId = WasmSymbol(2)

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt

@@ -390,6 +390,12 @@ class DeclarationGenerator(
             buildConstI32Symbol(packageNamePoolId, location)
             buildConstI32Symbol(simpleNamePoolId, location)
 
+            // TODO remove after bootstrap
+            buildConstI32(0, location)
+            buildConstI32(0, location)
+            buildConstI32(0, location)
+            buildConstI32(0, location)
+
             buildConstI64(wasmFileCodegenContext.referenceTypeId(symbol), location)
 
             val isAnonymousFlag = if (klass.isAnonymousObject) TYPE_INFO_FLAG_ANONYMOUS_CLASS else 0

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmCompiledModuleFragment.kt

@@ -236,6 +236,13 @@ class WasmCompiledModuleFragment(
                 WasmStructFieldDeclaration("superClassRtti", WasmRefNullType(WasmHeapType.Type(rttiTypeDeclarationSymbol)), false),
                 WasmStructFieldDeclaration("packageNamePoolId", WasmI32, false),
                 WasmStructFieldDeclaration("simpleNamePoolId", WasmI32, false),
+
+                // TODO remove after bootstrap
+                WasmStructFieldDeclaration("dummy0", WasmI32, false),
+                WasmStructFieldDeclaration("dummy1", WasmI32, false),
+                WasmStructFieldDeclaration("dummy2", WasmI32, false),
+                WasmStructFieldDeclaration("dummy3", WasmI32, false),
+
                 WasmStructFieldDeclaration("klassId", WasmI64, false),
                 WasmStructFieldDeclaration("typeInfoFlag", WasmI32, false),
             ),

libraries/stdlib/wasm/internal/kotlin/wasm/internal/TypeInfo.kt

@@ -59,7 +59,9 @@ internal fun getQualifiedName(rtti: kotlin.wasm.internal.reftypes.structref): St
 }
 
 internal fun getPackageName(rtti: kotlin.wasm.internal.reftypes.structref): String {
-    val flagFitsOneBitQualifier = wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_FITS_LATIN1_QUALIFIER
+    if (getWasmAbiVersion() < 1) return getPackageName0(rtti)
+
+    val flagFitsOneBitQualifier = wasmGetRttiIntField(9, rtti) and TYPE_INFO_FLAG_FITS_LATIN1_QUALIFIER
     val poolId = wasmGetRttiIntField(2, rtti)
     return if (flagFitsOneBitQualifier != 0)
         stringLiteralLatin1(poolId)
@@ -68,7 +70,9 @@ internal fun getPackageName(rtti: kotlin.wasm.internal.reftypes.structref): Stri
 }
 
 internal fun getSimpleName(rtti: kotlin.wasm.internal.reftypes.structref): String {
-    val flagFitsOneBitSimpleName = wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_FITS_LATIN1_SIMPLE_NAME
+    if (getWasmAbiVersion() < 1) return getSimpleName0(rtti)
+
+    val flagFitsOneBitSimpleName = wasmGetRttiIntField(9, rtti) and TYPE_INFO_FLAG_FITS_LATIN1_SIMPLE_NAME
     val poolId = wasmGetRttiIntField(3, rtti)
     return if (flagFitsOneBitSimpleName != 0)
         stringLiteralLatin1(poolId)
@@ -77,13 +81,13 @@ internal fun getSimpleName(rtti: kotlin.wasm.internal.reftypes.structref): Strin
 }
 
 internal fun getTypeId(rtti: kotlin.wasm.internal.reftypes.structref): Long =
-    wasmGetRttiLongField(4, rtti)
+    wasmGetRttiLongField(8, rtti)
 
 internal fun isAnonymousClass(rtti: kotlin.wasm.internal.reftypes.structref): Boolean =
-    (wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_ANONYMOUS_CLASS) != 0
+    (wasmGetRttiIntField(9, rtti) and TYPE_INFO_FLAG_ANONYMOUS_CLASS) != 0
 
 internal fun isLocalClass(rtti: kotlin.wasm.internal.reftypes.structref): Boolean =
-    (wasmGetRttiIntField(5, rtti) and TYPE_INFO_FLAG_LOCAL_CLASS) != 0
+    (wasmGetRttiIntField(9, rtti) and TYPE_INFO_FLAG_LOCAL_CLASS) != 0
 
 @Suppress("UNUSED_PARAMETER")
 @ExcludedFromCodegen
@@ -121,3 +125,17 @@ internal fun wasmGetRttiLongField(intFieldIndex: Int, obj: kotlin.wasm.internal.
 @ExcludedFromCodegen
 internal fun wasmGetRttiSuperClass(rtti: kotlin.wasm.internal.reftypes.structref): kotlin.wasm.internal.reftypes.structref? =
     implementedAsIntrinsic
+
+// TODO remove following *0 declarations after bootstrap
+
+internal fun getPackageName0(rtti: kotlin.wasm.internal.reftypes.structref): String = stringLiteral(
+    start = wasmGetRttiIntField(2, rtti),
+    length = wasmGetRttiIntField(3, rtti),
+    poolId = wasmGetRttiIntField(4, rtti),
+)
+
+internal fun getSimpleName0(rtti: kotlin.wasm.internal.reftypes.structref): String = stringLiteral(
+    start = wasmGetRttiIntField(5, rtti),
+    length = wasmGetRttiIntField(6, rtti),
+    poolId = wasmGetRttiIntField(7, rtti),
+)