js-polyfill: support Safari, which doesn't have instantiateStreaming

bytecodealliance · May 10, 2019 · ca8c8b3 · ca8c8b3
1 parent 072b2e8
commit ca8c8b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/wasmtime-wasi/js-polyfill/polyfill.c b/wasmtime-wasi/js-polyfill/polyfill.c
@@ -26,7 +26,7 @@ void handleFiles(void) {
         let file = document.getElementById('input').files[0]; \
         let file_with_mime_type = file.slice(0, file.size, 'application/wasm'); \
         let response = new Response(file_with_mime_type); \
-        WebAssembly.instantiateStreaming(response, imports) \
+        wasi_instantiateStreaming(response, imports) \
         .then(obj => { \
             setInstance(obj.instance); \
             try { \

diff --git a/wasmtime-wasi/js-polyfill/wasi.js b/wasmtime-wasi/js-polyfill/wasi.js
@@ -31,6 +31,17 @@ function handleWASIExit(e) {
     }
 }
 
+// Safari doesn't have instantiateStreaming
+function wasi_instantiateStreaming(response, imports) {
+    if (WebAssembly && WebAssembly.instantiateStreaming) {
+        return WebAssembly.instantiateStreaming(response, imports);
+    }
+    return response.arrayBuffer()
+        .then(function(buffer) {
+            return WebAssembly.instantiate(buffer, imports);
+        });
+}
+
 // The current guest wasm instance.
 var currentInstance;