Optimize swjs_get_prop to reduce memory store

Author: kateinoigakukun

Runtime/src/index.ts

@@ -130,17 +130,15 @@ export class SwiftRuntime {
         swjs_get_prop: (
             ref: ref,
             name: ref,
-            kind_ptr: pointer,
             payload1_ptr: pointer,
             payload2_ptr: pointer
         ) => {
             const memory = this.memory;
             const obj = memory.getObject(ref);
             const key = memory.getObject(name);
             const result = obj[key];
-            JSValue.write(
+            return JSValue.writeV2(
                 result,
-                kind_ptr,
                 payload1_ptr,
                 payload2_ptr,
                 false,

Runtime/src/types.ts

@@ -3,6 +3,7 @@ import * as JSValue from "./js-value.js";
 export type ref = number;
 export type pointer = number;
 export type bool = number;
+export type JavaScriptValueKind = number;
 export type JavaScriptValueKindAndFlags = number;
 
 export interface ExportedFunctions {
@@ -31,10 +32,9 @@ export interface ImportedFunctions {
     swjs_get_prop(
         ref: number,
         name: number,
-        kind_ptr: pointer,
         payload1_ptr: pointer,
         payload2_ptr: pointer
-    ): void;
+    ): JavaScriptValueKind;
     swjs_set_subscript(
         ref: number,
         index: number,

Sources/JavaScriptKit/JSValue.swift

@@ -196,9 +196,11 @@ extension JSValue: ExpressibleByNilLiteral {
 
 public func getJSValue(this: JSObject, name: JSString) -> JSValue {
     var rawValue = RawJSValue()
-    _get_prop(this.id, name.asInternalJSRef(),
-              &rawValue.kind,
-              &rawValue.payload1, &rawValue.payload2)
+    let rawBitPattern = _get_prop(
+        this.id, name.asInternalJSRef(),
+        &rawValue.payload1, &rawValue.payload2
+    )
+    rawValue.kind = unsafeBitCast(rawBitPattern, to: JavaScriptValueKind.self)
     return rawValue.jsValue
 }
 
@@ -226,9 +228,11 @@ public func setJSValue(this: JSObject, index: Int32, value: JSValue) {
 
 public func getJSValue(this: JSObject, symbol: JSSymbol) -> JSValue {
     var rawValue = RawJSValue()
-    _get_prop(this.id, symbol.id,
-              &rawValue.kind,
-              &rawValue.payload1, &rawValue.payload2)
+    let rawBitPattern = _get_prop(
+        this.id, symbol.id,
+        &rawValue.payload1, &rawValue.payload2
+    )
+    rawValue.kind = unsafeBitCast(rawBitPattern, to: JavaScriptValueKind.self)
     return rawValue.jsValue
 }
 

Sources/JavaScriptKit/Runtime/index.js

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

Sources/JavaScriptKit/Runtime/index.mjs

@@ -93,16 +93,17 @@ extern void _set_prop(const JavaScriptObjectRef _this,
 ///
 /// @param _this The target JavaScript object to get its member value.
 /// @param prop A JavaScript string object to reference a member of `_this` object.
-/// @param kind A result pointer of JavaScript value kind to get.
 /// @param payload1 A result pointer of first payload of JavaScript value to set the target object.
 /// @param payload2 A result pointer of second payload of JavaScript value to set the target object.
+/// @return A JavaScriptValueKind bits represented as 32bit integer for the returned value.
 __attribute__((__import_module__("javascript_kit"),
                __import_name__("swjs_get_prop")))
-extern void _get_prop(const JavaScriptObjectRef _this,
-                      const JavaScriptObjectRef prop,
-                      JavaScriptValueKind *kind,
-                      JavaScriptPayload1 *payload1,
-                      JavaScriptPayload2 *payload2);
+extern uint32_t _get_prop(
+  const JavaScriptObjectRef _this,
+  const JavaScriptObjectRef prop,
+  JavaScriptPayload1 *payload1,
+  JavaScriptPayload2 *payload2
+);
 
 /// `_set_subscript` sets a value of `_this` JavaScript object.
 ///