Remove dep between __cxa_rethrow_primary_exception and __cxa_rethrow (NFC)#26518
Merged
aheejin merged 10 commits intoemscripten-core:mainfrom Mar 24, 2026
Merged
Remove dep between __cxa_rethrow_primary_exception and __cxa_rethrow (NFC)#26518aheejin merged 10 commits intoemscripten-core:mainfrom
aheejin merged 10 commits intoemscripten-core:mainfrom
Conversation
Currently `__cxa_rethrow_primary_exception` calls `__cxa_rethrow`, and `__cxa_rethrow` is unnecessarily complicated to split logic when it is called from `__cxa_rethrow_primary_exception` and when it is not. This just decouples the two and duplicates the necessary logic in `__cxa_rethrow_primary_exception`. This makes `__cxa_rethrow` simple and easy to follow.
This is an automatic change generated by tools/maint/rebaseline_tests.py. The following (8) test expectation files were updated by running the tests with `--rebaseline`: ``` codesize/test_codesize_cxx_except.json: 195391 => 195372 [-19 bytes / -0.01%] codesize/test_codesize_cxx_mangle.json: 261882 => 261863 [-19 bytes / -0.01%] codesize/test_codesize_hello_dylink_all.json: 821851 => 821662 [-189 bytes / -0.02%] codesize/test_codesize_minimal_pthreads.json: 26629 => 26630 [+1 bytes / +0.00%] codesize/test_codesize_minimal_pthreads_memgrowth.json: 27032 => 27033 [+1 bytes / +0.00%] codesize/test_minimal_runtime_code_size_hello_embind.json: 14909 => 14908 [-1 bytes / -0.01%] codesize/test_minimal_runtime_code_size_hello_embind_val.json: 11642 => 11641 [-1 bytes / -0.01%] codesize/test_minimal_runtime_code_size_hello_wasm_worker.json: 4055 => 4060 [+5 bytes / +0.12%] Average change: +0.01% (-0.02% - +0.12%) ```
This is an automatic change generated by tools/maint/rebaseline_tests.py. The following (6) test expectation files were updated by running the tests with `--rebaseline`: ``` codesize/test_codesize_hello_dylink_all.json: 821662 => 821851 [+189 bytes / +0.02%] codesize/test_codesize_minimal_pthreads.json: 26630 => 26629 [-1 bytes / -0.00%] codesize/test_codesize_minimal_pthreads_memgrowth.json: 27033 => 27032 [-1 bytes / -0.00%] codesize/test_minimal_runtime_code_size_hello_embind.json: 14908 => 14909 [+1 bytes / +0.01%] codesize/test_minimal_runtime_code_size_hello_embind_val.json: 11641 => 11642 [+1 bytes / +0.01%] codesize/test_minimal_runtime_code_size_hello_wasm_worker.json: 4060 => 4055 [-5 bytes / -0.12%] Average change: -0.02% (-0.12% - +0.02%) ```
sbc100
reviewed
Mar 23, 2026
sbc100
reviewed
Mar 23, 2026
| #endif | ||
| #if EXCEPTION_DEBUG | ||
| dbg('__cxa_rethrow_primary_exception: ' + ptrToString(ptr)); | ||
| #endif |
Collaborator
There was a problem hiding this comment.
Maybe move this debugging to the top of the function?
sbc100
approved these changes
Mar 23, 2026
src/lib/libexceptions.js
Outdated
| __cxa_rethrow: () => { | ||
| var info = exceptionCaught.pop(); | ||
| if (!info) { | ||
| if (exceptionCaught.length == 0) { |
Collaborator
There was a problem hiding this comment.
Maybe just do !exceptionCaught.length ?
This is an automatic change generated by tools/maint/rebaseline_tests.py. The following (2) test expectation files were updated by running the tests with `--rebaseline`: ``` codesize/test_codesize_cxx_except.json: 195711 => 195689 [-22 bytes / -0.01%] codesize/test_codesize_cxx_mangle.json: 262202 => 262180 [-22 bytes / -0.01%] Average change: -0.01% (-0.01% - -0.01%) ```
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Currently
__cxa_rethrow_primary_exceptioncalls__cxa_rethrow, and__cxa_rethrowis unnecessarily complicated to split logic when it is called from__cxa_rethrow_primary_exceptionand when it is not.This just decouples the two and duplicates the necessary logic in
__cxa_rethrow_primary_exception. This makes__cxa_rethrowsimple and easy to follow.