Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use a fresh WebAssembly instance for each SourceMapConsumer #477

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 13 additions & 16 deletions lib/wasm.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,21 @@ function Mapping() {
this.name = null;
}

let cachedWasm = null;

module.exports = function wasm() {
if (cachedWasm) {
return cachedWasm;
let cachedCompiledWasm = null;
async function compile() {
if (!cachedCompiledWasm) {
const buf = await readWasm();
cachedCompiledWasm = await WebAssembly.compile(buf);
}
return cachedCompiledWasm;
}

module.exports = function wasm() {
const callbackStack = [];

cachedWasm = readWasm()
.then(buffer => {
return WebAssembly.instantiate(buffer, {
return compile()
.then(module => {
return WebAssembly.instantiate(module, {
env: {
mapping_callback(
generatedLine,
Expand Down Expand Up @@ -116,9 +119,9 @@ module.exports = function wasm() {
},
});
})
.then(Wasm => {
.then(instance => {
return {
exports: Wasm.instance.exports,
exports: instance.exports,
withMappingCallback: (mappingCallback, f) => {
callbackStack.push(mappingCallback);
try {
Expand All @@ -128,11 +131,5 @@ module.exports = function wasm() {
}
},
};
})
.then(null, e => {
cachedWasm = null;
throw e;
});

return cachedWasm;
};