Optimize _get_subscript to reduce memory store

Author: kateinoigakukun

Runtime/src/index.ts

@@ -161,15 +161,13 @@ export class SwiftRuntime {
         swjs_get_subscript: (
             ref: ref,
             index: number,
-            kind_ptr: pointer,
             payload1_ptr: pointer,
             payload2_ptr: pointer
         ) => {
             const obj = this.memory.getObject(ref);
             const result = obj[index];
-            JSValue.write(
+            return JSValue.writeV2(
                 result,
-                kind_ptr,
                 payload1_ptr,
                 payload2_ptr,
                 false,

Runtime/src/types.ts

@@ -45,10 +45,9 @@ export interface ImportedFunctions {
     swjs_get_subscript(
         ref: number,
         index: number,
-        kind_ptr: pointer,
         payload1_ptr: pointer,
         payload2_ptr: pointer
-    ): void;
+    ): JavaScriptValueKind;
     swjs_encode_string(ref: number, bytes_ptr_result: pointer): number;
     swjs_decode_string(bytes_ptr: pointer, length: number): number;
     swjs_load_string(ref: number, buffer: pointer): void;

Sources/JavaScriptKit/JSValue.swift

@@ -212,9 +212,11 @@ public func setJSValue(this: JSObject, name: JSString, value: JSValue) {
 
 public func getJSValue(this: JSObject, index: Int32) -> JSValue {
     var rawValue = RawJSValue()
-    _get_subscript(this.id, index,
-                   &rawValue.kind,
-                   &rawValue.payload1, &rawValue.payload2)
+    let rawBitPattern = _get_subscript(
+        this.id, index,
+        &rawValue.payload1, &rawValue.payload2
+    )
+    rawValue.kind = unsafeBitCast(rawBitPattern, to: JavaScriptValueKind.self)
     return rawValue.jsValue
 }
 

Sources/JavaScriptKit/Runtime/index.js

@@ -29,10 +29,9 @@ import _CJavaScriptKit
     func _get_subscript(
         _: JavaScriptObjectRef,
         _: Int32,
-        _: UnsafeMutablePointer<JavaScriptValueKind>!,
         _: UnsafeMutablePointer<JavaScriptPayload1>!,
         _: UnsafeMutablePointer<JavaScriptPayload2>!
-    ) { fatalError() }
+    ) -> UInt32 { fatalError() }
     func _encode_string(
         _: JavaScriptObjectRef,
         _: UnsafeMutablePointer<JavaScriptObjectRef>!

Sources/JavaScriptKit/Runtime/index.mjs

@@ -124,16 +124,17 @@ extern void _set_subscript(const JavaScriptObjectRef _this,
 ///
 /// @param _this The target JavaScript object to get its member value.
 /// @param index A subscript index to get value.
-/// @param kind A result pointer of JavaScript value kind to get.
 /// @param payload1 A result pointer of first payload of JavaScript value to get the target object.
 /// @param payload2 A result pointer of second payload of JavaScript value to get the target object.
+/// @return A JavaScriptValueKind bits represented as 32bit integer for the returned value.
 __attribute__((__import_module__("javascript_kit"),
                __import_name__("swjs_get_subscript")))
-extern void _get_subscript(const JavaScriptObjectRef _this,
-                           const int index,
-                           JavaScriptValueKind *kind,
-                           JavaScriptPayload1 *payload1,
-                           JavaScriptPayload2 *payload2);
+extern uint32_t _get_subscript(
+  const JavaScriptObjectRef _this,
+  const int index,
+  JavaScriptPayload1 *payload1,
+  JavaScriptPayload2 *payload2
+);
 
 /// `_encode_string` encodes the `str_obj` to bytes sequence and returns the length of bytes.
 ///