From d0fa7102b5be83be6d0670a5662013bf5f8d1b64 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Tue, 20 Feb 2024 13:10:48 -0800 Subject: [PATCH] JS Bindings: Use stringToUTF8OnStack instead of deprecated allocateUTF8OnStack (#6324) This avoids a warning on recent Emscripten. --- CMakeLists.txt | 4 ++-- src/js/binaryen.js-post.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1836d955659..def330b27b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -462,7 +462,7 @@ if(EMSCRIPTEN) target_link_libraries(binaryen_wasm "-sEXPORT_NAME=Binaryen") target_link_libraries(binaryen_wasm "-sNODERAWFS=0") target_link_libraries(binaryen_wasm "-sEXPORT_ES6") - target_link_libraries(binaryen_wasm "-sEXPORTED_RUNTIME_METHODS=allocateUTF8OnStack,stringToAscii") + target_link_libraries(binaryen_wasm "-sEXPORTED_RUNTIME_METHODS=stringToUTF8OnStack,stringToAscii") target_link_libraries(binaryen_wasm "-sEXPORTED_FUNCTIONS=_malloc,_free") target_link_libraries(binaryen_wasm "--post-js=${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-post.js") target_link_libraries(binaryen_wasm "-msign-ext") @@ -500,7 +500,7 @@ if(EMSCRIPTEN) else() target_link_libraries(binaryen_js "-sEXPORT_ES6=1") endif() - target_link_libraries(binaryen_js "-sEXPORTED_RUNTIME_METHODS=allocateUTF8OnStack,stringToAscii") + target_link_libraries(binaryen_js "-sEXPORTED_RUNTIME_METHODS=stringToUTF8OnStack,stringToAscii") target_link_libraries(binaryen_js "-sEXPORTED_FUNCTIONS=_malloc,_free") target_link_libraries(binaryen_js "--post-js=${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-post.js") # js_of_ocaml needs a specified variable with special comment to provide the library to consumers diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js index 111c020b3a0..125bbf01ed4 100644 --- a/src/js/binaryen.js-post.js +++ b/src/js/binaryen.js-post.js @@ -9,7 +9,7 @@ function preserveStack(func) { } function strToStack(str) { - return str ? allocateUTF8OnStack(str) : 0; + return str ? stringToUTF8OnStack(str) : 0; } function i32sToStack(i32s) {