Bump emsdk version

.github/workflows/rust.yml

@@ -27,7 +27,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: emscripten/emsdk:2.0.15
+      image: emscripten/emsdk:2.0.16
 
     steps:
     - uses: actions/checkout@v2
@@ -67,7 +67,12 @@ jobs:
       with:
         name: target
         path: target/
-    - run: wasm-objdump -x -j em_asm target/deploy/bin.wasm
+    - uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: emscripten_logs
+        path: /tmp/emscripten_temp
+    - run: wasm-objdump --details --headers --reloc --debug --section=data --full-contents target/wasm32-unknown-emscripten/debug/deps/bin-*.wasm
       if: always()
       continue-on-error: true
     - uses: actions-rs/clippy-check@v1

Makefile.toml

@@ -1,11 +1,12 @@
 [env]
-EMMAKEN_CFLAGS = "-s ERROR_ON_UNDEFINED_SYMBOLS=0 -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_MEMORY=33554432 -sEXTRA_EXPORTED_RUNTIME_METHODS=[ccall,cwrap,callback] -s ASSERTIONS=1 -s SAFE_HEAP=1"
+EMMAKEN_CFLAGS = "-v -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_MEMORY=33554432 -s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$readAsmConstArgs -sEXTRA_EXPORTED_RUNTIME_METHODS=ccall,cwrap,callback,__start_em_asm,__stop_em_asm -s ASSERTIONS=1 -s SAFE_HEAP=1"
+EMCC_DEBUG = "1"
 
 [tasks.build]
 clear = true
 dependencies = ['prebuild']
 command = "cargo"
-args = ["build", "--tests", "--target", "wasm32-unknown-emscripten"]
+args = ["build", "--tests", "--target", "wasm32-unknown-emscripten", "-vv"]
 
 [tasks.deploy]
 dependencies = ["ci-flow"]

src/jse.rs

@@ -16,13 +16,14 @@ macro_rules! jse {
 
             let array = &AlignToSixteen([$($i,)*]);
             let sig = CString::new("i".repeat(LEN)).expect("sig");
-            const SNIPPET: &'static [u8] = $js_expr;
+            #[link_section = ".data,em_asm"]
+            static SNIPPET: [u8; $js_expr.len()] = *$js_expr;
 
             assert_eq!(SNIPPET[..].last().expect("empty snippet?"), &0);
 
             unsafe {
                 emscripten_asm_const_int(
-                    SNIPPET as *const _ as *const u8,
+                    SNIPPET.as_ptr() as *const _ as *const u8,
                     sig.as_ptr() as *const _ as *const u8,
                     array as *const _ as *const u8,
                 ) as i32
@@ -31,11 +32,12 @@ macro_rules! jse {
     };
     ($js_expr:expr) => {
         {
-            const SNIPPET: &'static [u8] = $js_expr;
+            #[link_section = ".data,em_asm"]
+            static SNIPPET: [u8; $js_expr.len()] = *$js_expr;
 
             unsafe {
                 emscripten_asm_const_int(
-                    SNIPPET as *const _ as *const u8,
+                    SNIPPET.as_ptr() as *const _ as *const u8,
                     crate::jse::empty_sig.as_ptr() as *const _ as *const u8,
                     std::ptr::null() as *const _ as *const u8,
                 ) as i32