Replace the legacy Emscripten JS-exceptions model with native wasm-EH (legacy encoding) across the whole build, keeping Asyncify coroutines working via a from-source Binaryen --hoist-cpp-catches pre-pass. Net result: native-EH is the only build mode, the 3D viewer is on by default, and pcbnew shrinks substantially. Highlights: - Binaryen submodule everywhere + --hoist-cpp-catches integration in apply-asyncify; post-link Asyncify covers every app wasm (not just standalone test wasm). - Build deps (incl. OpenCASCADE without OCC_CONVERT_SIGNALS) and all KiCad apps with -fwasm-exceptions; emscripten_sleep added to the post-link asyncify-imports. - libcontext fiber entry wired under native exceptions; while-loop main loop + currData shim injected into all wx apps. - Native-EH collab apply fixed: DEBUG-define the embind TU + match all out-of-CMake C++ TUs' ABI flags to the core, fixing the vtable-layout skew / mis-dispatch. - 3D viewer enabled by default (real raytracer linked, not the stub). - Retire the EH-spike scaffolding; flip the asyncify-races ablation pins to shim-redundancy pins (native-EH stays clean with the legacy shims ablated). - Fix the asyncify-races quiescence check to not require Asyncify.currData==0: under the native-EH per-frame-yield top loop the main stack is asyncify-suspended every frame, so currData legitimately churns (a freed-but-not-yet-nulled buffer, not a leak). Refresh the pcbnew toolbar screenshot baseline for the new kicad. - CI: drop the obsolete binaryen_version input/env (the build uses the binaryen submodule fork's wasm-opt, not a version download); key the wasm-output cache on the binaryen submodule SHA instead. Bumps the wxwidgets + binaryen submodules to their squashed feature commits. Validated green: all 7 apps native-EH (real 3D in pcbnew); KiCad e2e 63/63 Firefox + Chromium (3D viewer renders); wx 336; coroutine 34/34 both engines; asyncify 7/7 both engines. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
49 lines
1.6 KiB
WebAssembly Text Format
49 lines
1.6 KiB
WebAssembly Text Format
;; Regression repro of PGM_BASE::HandleException (KiCad) — the case-6 shape (a cpp catch nested in an
|
|
;; outer try's catch_all cleanup pad) WITH an intervening block in that cleanup that the cpp arm
|
|
;; br's to. LLVM emits this for `try{} catch(A&) catch(B&) catch(...)`: the outer try has only a
|
|
;; catch_all (destructor cleanup), inside which it (rethrow)s into a nested try whose cpp catch does
|
|
;; the __cxa type dispatch and, when done, (br)s OUT to a block ($blk) sitting between the escape
|
|
;; target and the arm. Hoisting that arm to the dispatch section orphaned the br — "all break targets
|
|
;; must be valid, on (br $blk)". cpp tag = single i32.
|
|
(module
|
|
(tag $cpp (param i32))
|
|
|
|
;; Exception path: outer body throws cpp(1); the catch_all reclassifies via (rethrow $outer) inside
|
|
;; (block $blk); the nested cpp arm handles it (r := 42) then (br $blk) to finish. expect 42.
|
|
(func $caught (export "caught") (result i32)
|
|
(local $r i32)
|
|
(try $outer
|
|
(do
|
|
(throw $cpp (i32.const 1)))
|
|
(catch_all
|
|
(block $blk
|
|
(try
|
|
(do
|
|
(rethrow $outer))
|
|
(catch $cpp
|
|
(drop (pop i32))
|
|
(local.set $r (i32.const 42))
|
|
(br $blk))
|
|
(catch_all
|
|
(rethrow $outer))))))
|
|
(local.get $r))
|
|
|
|
;; No-exception path: body falls through with r := 7, neither catch runs. expect 7.
|
|
(func $normal (export "normal") (result i32)
|
|
(local $r i32)
|
|
(try $outer
|
|
(do
|
|
(local.set $r (i32.const 7)))
|
|
(catch_all
|
|
(block $blk
|
|
(try
|
|
(do
|
|
(rethrow $outer))
|
|
(catch $cpp
|
|
(drop (pop i32))
|
|
(local.set $r (i32.const 42))
|
|
(br $blk))
|
|
(catch_all
|
|
(rethrow $outer))))))
|
|
(local.get $r))
|
|
)
|