Make getExceptionMessage work with ASSERTIONS #26050
Open
+27
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`getExceptionMessage` didn't work with `-sASSERTIONS`, which is the default mode for `-O0`, because `getExceptionMessage` assumes the input `ptr` is a pointer, whereas when `ASSERTIONS` is set, it is an instance of `CppException`. `in/decrementExceptionRefcount` have the same problem. Now these methods check whether the pointer is a value or an instance of `CppException`. Fixes emscripten-core#17115 (comment).
sbc100
reviewed
Jan 8, 2026
|
|
||
| @with_all_eh_sjlj | ||
| def test_EXPORT_EXCEPTION_HANDLING_HELPERS(self): | ||
| self.set_setting('ASSERTIONS', 0) |
Collaborator
There was a problem hiding this comment.
Better to just remove this line. No need for the additional change below since core tests run in O0 mode with assertions enabled already.
sbc100
reviewed
Jan 8, 2026
| if (ptr instanceof CppException) { | ||
| ptr = ptr.excPtr; | ||
| } | ||
| #endif |
Collaborator
There was a problem hiding this comment.
Seems a bit on that ptr might be something other than a pointer. Why not expect caller to always pass a pointer here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
getExceptionMessagedidn't work with-sASSERTIONS, which is the default mode for-O0, becausegetExceptionMessageassumes the inputptris a pointer, whereas whenASSERTIONSis set, it is an instance ofCppException.in/decrementExceptionRefcounthave the same problem. Now these methods check whether the pointer is a value or an instance ofCppException.Fixes #17115 (comment).