[Wasm] Serialize and deserialize strings with a reference cache

JetBrains · Sep 21, 2024 · 9cd72bd · 9cd72bd
1 parent 8a32989
commit 9cd72bd
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/...r/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/serialization/WasmDeserializer.kt b/...r/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/serialization/WasmDeserializer.kt
@@ -533,33 +533,31 @@ class WasmDeserializer(inputStream: InputStream, private val skipLocalNames: Boo
     }
 
     private fun deserializeString(): String {
-        return withFlags {
-            if (it.consume()) {
-                val length = b.readUInt32().toInt()
-                val bytes = b.readBytes(length)
-                String(bytes)
-            } else {
-                val lengthBytes = b.readUInt32().toInt()
-                val bytes = b.readBytes(lengthBytes)
-                val length = lengthBytes / Char.SIZE_BYTES
-                val charArray = CharArray(length)
-                for (i in 0..<length) {
-                    val hi = bytes[i * Char.SIZE_BYTES].toInt() and 0xFF
-                    val lo = bytes[i * Char.SIZE_BYTES + 1].toInt() and 0xFF
-                    val code = hi or (lo shl Byte.SIZE_BITS)
-                    charArray[i] = code.toChar()
+        return deserializeReference {
+            withFlags {
+                if (it.consume()) {
+                    val length = b.readUInt32().toInt()
+                    val bytes = b.readBytes(length)
+                    String(bytes)
+                } else {
+                    val lengthBytes = b.readUInt32().toInt()
+                    val bytes = b.readBytes(lengthBytes)
+                    val length = lengthBytes / Char.SIZE_BYTES
+                    val charArray = CharArray(length)
+                    for (i in 0..<length) {
+                        val hi = bytes[i * Char.SIZE_BYTES].toInt() and 0xFF
+                        val lo = bytes[i * Char.SIZE_BYTES + 1].toInt() and 0xFF
+                        val code = hi or (lo shl Byte.SIZE_BITS)
+                        charArray[i] = code.toChar()
+                    }
+                    String(charArray)
                 }
-                String(charArray)
             }
         }
     }
 
     private fun skipString() {
-        withFlags {
-            it.consume()
-            val length = b.readUInt32().toInt()
-            b.skip(length)
-        }
+        skipInt()
     }
 
     private fun deserializeInt() = b.readUInt32().toInt()

diff --git a/...ler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/serialization/WasmSerializer.kt b/...ler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/serialization/WasmSerializer.kt
@@ -556,22 +556,24 @@ class WasmSerializer(outputStream: OutputStream) {
     }
 
     private fun serialize(str: String) {
-        val chars = str.toCharArray()
-        if (chars.none { it.isSurrogate() }) {
-            withFlags(true) {
-                serialize(str.toByteArray())
-            }
-        } else {
-            val charsByteArray = ByteArray(chars.size * Char.SIZE_BYTES)
-            var index = 0
-            for (char in chars) {
-                val code = char.code
-                charsByteArray[index * Char.SIZE_BYTES] = (code and 0xFF).toByte()
-                charsByteArray[index * Char.SIZE_BYTES + 1] = (code ushr Byte.SIZE_BITS).toByte()
-                index++
-            }
-            withFlags(false) {
-                serialize(charsByteArray)
+        serializeAsReference(str) {
+            val chars = str.toCharArray()
+            if (chars.none { it.isSurrogate() }) {
+                withFlags(true) {
+                    serialize(str.toByteArray())
+                }
+            } else {
+                val charsByteArray = ByteArray(chars.size * Char.SIZE_BYTES)
+                var index = 0
+                for (char in chars) {
+                    val code = char.code
+                    charsByteArray[index * Char.SIZE_BYTES] = (code and 0xFF).toByte()
+                    charsByteArray[index * Char.SIZE_BYTES + 1] = (code ushr Byte.SIZE_BITS).toByte()
+                    index++
+                }
+                withFlags(false) {
+                    serialize(charsByteArray)
+                }
             }
         }
     }