[EH] Guard destructor changes in libc++abi with __wasm__ #21974
Merged
Conversation
This file contains 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
These changes are due to that Wasm destructor returns its argument, so in case someone wants to compile out libc++abi _without_ using Wasm EH, these will error out too. In Emscripten this has been fine because in `system_lib.py` we only build these files when Wasm EH is enabled, but this may not be the case if we upstream our changes.
sbc100
approved these changes
May 21, 2024
aheejin
added a commit
to aheejin/llvm-project
that referenced
this pull request
May 22, 2024
This upstreams more recent, mostly EH changes from libcxx and libcxxabi: - `__cxa_init_primary_exception`-related changes made when updating to LLVM 18.1.2 (emscripten-core/emscripten#21638) - Removes ctype macros (emscripten-core/emscripten#20960) - Guard destructor changes with `__wasm__` (emscripten-core/emscripten#21974)
aheejin
added a commit
to llvm/llvm-project
that referenced
this pull request
May 22, 2024
This upstreams more recent, mostly EH changes from libcxx and libcxxabi: - `__cxa_init_primary_exception`-related changes made when updating to LLVM 18.1.2 (emscripten-core/emscripten#21638) - Removes ctype macros (emscripten-core/emscripten#20960) - Guard destructor changes with `__wasm__` (emscripten-core/emscripten#21974)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These changes are due to that Wasm destructor returns its argument, so in case someone wants to compile out libc++abi without using Wasm EH, these will error out too. In Emscripten this has been fine because in
system_lib.pywe only build these files when Wasm EH is enabled, but this may not be the case if we upstream our changes.