From edc438e68ce043abdc2667a207aeb1c8e5836f0b Mon Sep 17 00:00:00 2001 From: krmbn0576 Date: Mon, 5 Feb 2024 10:17:16 +0900 Subject: [PATCH 1/3] specialize and return ASCII-8BIT data --- .../ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js b/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js index 02aa2fb469..b4b984f786 100644 --- a/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js +++ b/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js @@ -69,9 +69,17 @@ export function addRbJsAbiHostToImports(imports, obj, get_export) { imports["rb-js-abi-host"]["js-value-to-string: func(value: handle) -> string"] = function(arg0, arg1) { const memory = get_export("memory"); const realloc = get_export("cabi_realloc"); - const ret0 = obj.jsValueToString(resources0.get(arg0)); - const ptr0 = utf8_encode(ret0, realloc, memory); - const len0 = UTF8_ENCODED_LEN; + let ret0, ptr0, len0; + ret0 = resources0.get(arg0); + if (ret0 instanceof ArrayBuffer) { + ptr0 = realloc(0, 0, 1, ret0.byteLength); + len0 = ret0.byteLength; + new Uint8Array(memory.buffer).set(new Uint8Array(ret0), ptr0); + } else { + ret0 = obj.jsValueToString(ret0); + ptr0 = utf8_encode(ret0, realloc, memory); + len0 = UTF8_ENCODED_LEN; + } data_view(memory).setInt32(arg1 + 4, len0, true); data_view(memory).setInt32(arg1 + 0, ptr0, true); }; @@ -275,4 +283,4 @@ export function addRbJsAbiHostToImports(imports, obj, get_export) { if (obj.dropJsAbiValue) obj.dropJsAbiValue(val); }; -} \ No newline at end of file +} From 21564a3e7087097e3275cdc0009d5926387b955c Mon Sep 17 00:00:00 2001 From: krmbn0576 Date: Mon, 5 Feb 2024 10:39:03 +0900 Subject: [PATCH 2/3] lint --- .../ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js b/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js index b4b984f786..94c6455105 100644 --- a/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js +++ b/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js @@ -69,15 +69,14 @@ export function addRbJsAbiHostToImports(imports, obj, get_export) { imports["rb-js-abi-host"]["js-value-to-string: func(value: handle) -> string"] = function(arg0, arg1) { const memory = get_export("memory"); const realloc = get_export("cabi_realloc"); - let ret0, ptr0, len0; - ret0 = resources0.get(arg0); + const ret0 = resources0.get(arg0); + let ptr0, len0; if (ret0 instanceof ArrayBuffer) { ptr0 = realloc(0, 0, 1, ret0.byteLength); len0 = ret0.byteLength; new Uint8Array(memory.buffer).set(new Uint8Array(ret0), ptr0); } else { - ret0 = obj.jsValueToString(ret0); - ptr0 = utf8_encode(ret0, realloc, memory); + ptr0 = utf8_encode(obj.jsValueToString(ret0), realloc, memory); len0 = UTF8_ENCODED_LEN; } data_view(memory).setInt32(arg1 + 4, len0, true); @@ -284,3 +283,4 @@ export function addRbJsAbiHostToImports(imports, obj, get_export) { obj.dropJsAbiValue(val); }; } + From c606aadb00448ccdf1dbbd396e2a2f4a4334e403 Mon Sep 17 00:00:00 2001 From: krmbn0576 Date: Mon, 5 Feb 2024 10:44:40 +0900 Subject: [PATCH 3/3] lint --- .../npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js b/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js index 94c6455105..18b15829ef 100644 --- a/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js +++ b/packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js @@ -282,5 +282,4 @@ export function addRbJsAbiHostToImports(imports, obj, get_export) { if (obj.dropJsAbiValue) obj.dropJsAbiValue(val); }; -} - +} \ No newline at end of file