The shim bound bare dynCall_* names to JS getWasmTableEntry() calls, bypassing the asyncify-instrumented dynCall_* wasm trampolines that -sDYNCALLS=1 provides. That broke Asyncify unwind/rewind through indirect calls -> "indirect call signature mismatch" (caught every frame in Firefox; fatal renderer crash in Chrome). Bind the bare names to wasmExports["dynCall_<sig>"] instead. Result: the PCBnew "select draw lines" e2e is green in Firefox (tool selects and draws, zero page errors). Dropped the fiber-stabilization block, the shipped diagnostic block, and the exportCallStack JS hack (all compensated for the wrong binding); shim shrank 521 -> ~250 lines. - scripts/common/inject-dyncall-shims.sh: orchestrator only; injected JS extracted to scripts/common/shims/ - scripts/common/shims/dyncall-binding.js.tmpl: per-signature binding template - scripts/common/shims/handlesleep.js: nested-Asyncify handleSleep fix (#9153) - scripts/common/shims/diagnostics.js: logging-only, opt-in via SHIM_DIAGNOSTICS=1 - tests/package.json: add test:kicad:firefox / test:kicad:chrome scripts Known issue (tracked separately): Chrome still renderer-crashes on the first coroutine resume. Asyncify.doRewind replays the deep main-context call stack and exceeds V8's execution-stack limit (Firefox tolerates the same wasm). Proper fix is JSPI. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
67 lines
2.7 KiB
JavaScript
67 lines
2.7 KiB
JavaScript
// === Nested-Asyncify handleSleep currData save/restore (Emscripten #9153) ===
|
|
//
|
|
// Asyncify.currData is a single-slot global. When a fiber swap runs inside an
|
|
// EM_ASYNC_JS Promise await (e.g., wxDialog::ShowModal via startModal), the
|
|
// fiber swap overwrites currData with the fiber's asyncify_data, losing the
|
|
// sleep's own buffer. On Promise resolution, handleSleep's doRewind then uses
|
|
// the wrong buffer and crashes with "index out of bounds" or "unreachable".
|
|
//
|
|
// Workaround: intercept Asyncify.allocateData to record which pointer belongs to
|
|
// the active handleSleep; restore it to Asyncify.currData inside the wakeUp
|
|
// callback before handleSleep proceeds to _asyncify_start_rewind + doRewind.
|
|
if (typeof Asyncify !== "undefined") {
|
|
if (typeof Asyncify.handleSleep === "function"
|
|
&& typeof Asyncify.allocateData === "function"
|
|
&& !Asyncify.__nestedHandleSleepInstalled) {
|
|
// Stack of handleSleep contexts awaiting their allocateData association.
|
|
Asyncify.__pendingSleepContexts = [];
|
|
|
|
var __originalAllocateData = Asyncify.allocateData.bind(Asyncify);
|
|
Asyncify.allocateData = function() {
|
|
var ptr = __originalAllocateData();
|
|
// Associate with the innermost pending handleSleep not yet linked.
|
|
for (var i = Asyncify.__pendingSleepContexts.length - 1; i >= 0; --i) {
|
|
var ctx = Asyncify.__pendingSleepContexts[i];
|
|
if (!ctx.capturedData) {
|
|
ctx.capturedData = ptr;
|
|
break;
|
|
}
|
|
}
|
|
return ptr;
|
|
};
|
|
|
|
var __originalHandleSleep = Asyncify.handleSleep.bind(Asyncify);
|
|
Asyncify.handleSleep = function(startAsync) {
|
|
var sleepCtx = { capturedData: null, cleanedUp: false };
|
|
Asyncify.__pendingSleepContexts.push(sleepCtx);
|
|
|
|
var cleanup = function() {
|
|
if (sleepCtx.cleanedUp) return;
|
|
sleepCtx.cleanedUp = true;
|
|
var idx = Asyncify.__pendingSleepContexts.indexOf(sleepCtx);
|
|
if (idx !== -1) Asyncify.__pendingSleepContexts.splice(idx, 1);
|
|
};
|
|
|
|
try {
|
|
return __originalHandleSleep(function(wakeUp) {
|
|
return startAsync(function(result) {
|
|
// wakeUp runs from pure JS on Promise resolution. Fiber swaps during
|
|
// the await may have overwritten Asyncify.currData. Restore OUR buffer
|
|
// so handleSleep's _asyncify_start_rewind and doRewind use it.
|
|
if (sleepCtx.capturedData) {
|
|
Asyncify.currData = sleepCtx.capturedData;
|
|
}
|
|
cleanup();
|
|
return wakeUp(result);
|
|
});
|
|
});
|
|
} catch (e) {
|
|
cleanup();
|
|
throw e;
|
|
}
|
|
};
|
|
|
|
Asyncify.__nestedHandleSleepInstalled = true;
|
|
}
|
|
}
|
|
// === End nested-Asyncify handleSleep fix ===
|