Use the WebAssembly API manually, to try to make it compatible with both browser and tests. Doesn't work for tests yet.

Author: mstange

package.json

@@ -47,7 +47,6 @@
     "common-tags": "^1.7.2",
     "copy-to-clipboard": "^3.0.8",
     "escape-string-regexp": "^1.0.5",
-    "gecko-profiler-demangle": "^0.1.0",
     "jszip": "^3.1.5",
     "memoize-immutable": "^3.0.0",
     "mixedtuplemap": "^1.0.0",

src/profile-logic/gecko_profiler_demangle.js

@@ -0,0 +1,101 @@
+import wasm_path from 'file-loader!./gecko_profiler_demangle_bg.wasmpleaseignoremewebpack';
+
+// The code below was generated using `wasm-bindgen --no-modules`, except for
+// the export statement at the very end which I added manually, and except for
+// the fact that the init() function now no longer takes a parameter and instead
+// uses the wasm_path variable that I'm declaring at the top.
+
+(function() {
+    var wasm;
+    const __exports = {};
+    
+    
+    let cachedEncoder = new TextEncoder('utf-8');
+    
+    let cachegetUint8Memory = null;
+    function getUint8Memory() {
+        if (cachegetUint8Memory === null || cachegetUint8Memory.buffer !== wasm.memory.buffer) {
+            cachegetUint8Memory = new Uint8Array(wasm.memory.buffer);
+        }
+        return cachegetUint8Memory;
+    }
+    
+    function passStringToWasm(arg) {
+        
+        const buf = cachedEncoder.encode(arg);
+        const ptr = wasm.__wbindgen_malloc(buf.length);
+        getUint8Memory().set(buf, ptr);
+        return [ptr, buf.length];
+    }
+    
+    let cachedDecoder = new TextDecoder('utf-8');
+    
+    function getStringFromWasm(ptr, len) {
+        return cachedDecoder.decode(getUint8Memory().subarray(ptr, ptr + len));
+    }
+    
+    let cachedGlobalArgumentPtr = null;
+    function globalArgumentPtr() {
+        if (cachedGlobalArgumentPtr === null) {
+            cachedGlobalArgumentPtr = wasm.__wbindgen_global_argument_ptr();
+        }
+        return cachedGlobalArgumentPtr;
+    }
+    
+    let cachegetUint32Memory = null;
+    function getUint32Memory() {
+        if (cachegetUint32Memory === null || cachegetUint32Memory.buffer !== wasm.memory.buffer) {
+            cachegetUint32Memory = new Uint32Array(wasm.memory.buffer);
+        }
+        return cachegetUint32Memory;
+    }
+    /**
+    * Takes an input string and runs it through a sequence of demanglers. Returns
+    * the demangled string if a match was found, or the original string if not.
+    * @param {string} arg0
+    * @returns {string}
+    */
+    __exports.demangle_any = function(arg0) {
+        const [ptr0, len0] = passStringToWasm(arg0);
+        const retptr = globalArgumentPtr();
+        try {
+            wasm.demangle_any(retptr, ptr0, len0);
+            const mem = getUint32Memory();
+            const rustptr = mem[retptr / 4];
+            const rustlen = mem[retptr / 4 + 1];
+            
+            const realRet = getStringFromWasm(rustptr, rustlen).slice();
+            wasm.__wbindgen_free(rustptr, rustlen * 1);
+            return realRet;
+            
+            
+        } finally {
+            wasm.__wbindgen_free(ptr0, len0 * 1);
+            
+        }
+        
+    };
+    
+    __exports.__wbindgen_throw = function(ptr, len) {
+        throw new Error(getStringFromWasm(ptr, len));
+    };
+    
+    function init() {
+        const fetchPromise = fetch(wasm_path);
+        let resultPromise;
+        if (typeof WebAssembly.instantiateStreaming === 'function') {
+            resultPromise = WebAssembly.instantiateStreaming(fetchPromise, { './gecko_profiler_demangle': __exports });
+        } else {
+            resultPromise = fetchPromise
+            .then(response => response.arrayBuffer())
+            .then(buffer => WebAssembly.instantiate(buffer, { './gecko_profiler_demangle': __exports }));
+        }
+        return resultPromise.then(({instance}) => {
+            wasm = init.wasm = instance.exports;
+            return;
+        });
+    };
+    self.wasm_bindgen = Object.assign(init, __exports);
+})();
+
+export default wasm_bindgen;

src/profile-logic/gecko_profiler_demangle_bg.wasmpleaseignoremewebpack

@@ -7,7 +7,8 @@ import SymbolStoreDB from './symbol-store-db';
 import { SymbolsNotFoundError } from './errors';
 import bisection from 'bisection';
 
-const demanglerModulePromise = import('gecko-profiler-demangle');
+import demanglerModule from './gecko_profiler_demangle';
+const demanglerModulePromise = demanglerModule();
 
 import type { RequestedLib } from '../types/actions';
 import type { SymbolTableAsTuple } from './symbol-store-db';

src/profile-logic/symbol-store.js

@@ -18,7 +18,7 @@ const config = {
       'redux-devtools': path.join(__dirname, '..', '..', 'src'),
       react: path.join(__dirname, 'node_modules', 'react'),
     },
-    extensions: ['.js', '.wasm'],
+    extensions: ['.js'],
   },
   devtool: 'source-map',
   module: {
@@ -52,6 +52,10 @@ const config = {
         test: /\.svg$/,
         loader: 'file-loader',
       },
+      {
+        test: /\.wasm$/,
+        loader: 'file-loader',
+      },
     ],
   },
   node: {

webpack.config.js

@@ -3916,10 +3916,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gecko-profiler-demangle@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/gecko-profiler-demangle/-/gecko-profiler-demangle-0.1.0.tgz#7bc08d43e3572e64a6c09c4ed6680e4bc4ce356e"
-
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"