Skip to content

[EH] Remove exnToPtr method (NFC) #26528

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.

Sign up for GitHub

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

Merged
aheejin merged 2 commits into from
Mar 24, 2026
+7 −18
Merged

[EH] Remove exnToPtr method (NFC) #26528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d92741e
[EH] Remove exnToPtr method (NFC)
aheejin Mar 24, 2026
36821f8
Pass this pointer to getExceptionMessage
aheejin Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions src/lib/libexceptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,25 +384,14 @@ var LibraryExceptions = {
},

#elif !DISABLE_EXCEPTION_CATCHING
// When EXCEPTION_STACK_TRACES is set, the exception is an instance of
// CppException, whereas EXCEPTION_STACK_TRACES is unset it is a raw pointer.
$exnToPtr: (exn) => {
#if EXCEPTION_STACK_TRACES
if (exn instanceof CppException) {
return exn.excPtr;
}
#endif
return exn;
},

$incrementExceptionRefcount__deps: ['$exnToPtr', '__cxa_increment_exception_refcount'],
$incrementExceptionRefcount: (exn) => ___cxa_increment_exception_refcount(exnToPtr(exn)),
$incrementExceptionRefcount__deps: ['__cxa_increment_exception_refcount'],
$incrementExceptionRefcount: (exn) => ___cxa_increment_exception_refcount(exn.excPtr),

$decrementExceptionRefcount__deps: ['$exnToPtr', '__cxa_decrement_exception_refcount'],
$decrementExceptionRefcount: (exn) => ___cxa_decrement_exception_refcount(exnToPtr(exn)),
$decrementExceptionRefcount__deps: ['__cxa_decrement_exception_refcount'],
$decrementExceptionRefcount: (exn) => ___cxa_decrement_exception_refcount(exn.excPtr),

$getExceptionMessage__deps: ['$exnToPtr', '$getExceptionMessageCommon'],
$getExceptionMessage: (exn) => getExceptionMessageCommon(exnToPtr(exn)),
$getExceptionMessage__deps: ['$getExceptionMessageCommon'],
$getExceptionMessage: (exn) => getExceptionMessageCommon(exn.excPtr),

#endif
};
Expand Down
2 changes: 1 addition & 1 deletion src/runtime_exceptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class CppException extends EmscriptenEH {
#endif
this.excPtr = excPtr;
#if !DISABLE_EXCEPTION_CATCHING && EXCEPTION_STACK_TRACES
const excInfo = getExceptionMessage(excPtr);
const excInfo = getExceptionMessage(this);
this.name = excInfo[0];
this.message = excInfo[1];
#endif
Expand Down
Loading