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>
60 lines
1.9 KiB
WebAssembly Text Format
60 lines
1.9 KiB
WebAssembly Text Format
;; Regression repro of SYMBOL_EDIT_FRAME::DuplicateSymbol (KiCad eeschema). A cpp catch arm that is
|
|
;; hoisted PAST an ancestor catch_all (the case-6 deferral) carries a nested __cxa_end_catch cleanup
|
|
;; (try (do ..) (delegate $M)) whose delegate target $M is a mid try sitting INSIDE that ancestor
|
|
;; catch_all. Hoisting the arm out (into the dispatch section, outside every try) orphaned the
|
|
;; delegate -> wasm-validator "all delegate targets must be valid, on (delegate $M)". The fix
|
|
;; retargets it to DELEGATE_CALLER_TARGET (a delegate can only target a try or the caller, not the
|
|
;; $done block); re-throwing a cleanup exception to the caller is the C++ throw-during-cleanup
|
|
;; (std::terminate) path, never taken in normal flow. cpp tag = single i32.
|
|
(module
|
|
(tag $cpp (param i32))
|
|
|
|
;; Exception path: $A throws cpp(1); its catch_all (re)throws into $inner whose cpp arm sets r:=42,
|
|
;; its __cxa_end_catch cleanup delegates to the enclosing $M. expect 42.
|
|
(func $caught (export "caught") (result i32)
|
|
(local $r i32)
|
|
(try $A
|
|
(do
|
|
(throw $cpp (i32.const 1)))
|
|
(catch_all
|
|
(try $M
|
|
(do
|
|
(try $inner
|
|
(do
|
|
(rethrow $A))
|
|
(catch $cpp
|
|
(drop (pop i32))
|
|
(local.set $r (i32.const 42))
|
|
(try
|
|
(do (nop))
|
|
(delegate $M)))
|
|
(catch_all
|
|
(rethrow $A))))
|
|
(catch_all
|
|
(rethrow $A)))))
|
|
(local.get $r))
|
|
|
|
;; No-exception path: $A body falls through with r:=7. expect 7.
|
|
(func $normal (export "normal") (result i32)
|
|
(local $r i32)
|
|
(try $A
|
|
(do
|
|
(local.set $r (i32.const 7)))
|
|
(catch_all
|
|
(try $M
|
|
(do
|
|
(try $inner
|
|
(do
|
|
(rethrow $A))
|
|
(catch $cpp
|
|
(drop (pop i32))
|
|
(local.set $r (i32.const 42))
|
|
(try
|
|
(do (nop))
|
|
(delegate $M)))
|
|
(catch_all
|
|
(rethrow $A))))
|
|
(catch_all
|
|
(rethrow $A)))))
|
|
(local.get $r))
|
|
)
|