-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Use arch::wasm::unreachable
instead of arch::wasm32::unreachable
#122878
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Conversation
rustbot has assigned @Mark-Simulacrum. Use |
Either this or #122797 can be closed. But this solution looks more elegant. |
@bors r+ rollup |
@@ -59,7 +59,7 @@ pub unsafe fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwi | |||
wasm_throw(0, exception.cast()) | |||
} else { | |||
let _ = exception; | |||
core::arch::wasm32::unreachable() | |||
core::arch::wasm::unreachable() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
core::arch::wasm requires the simd_wasm64 feature, but AFAIK it isn't set in this crate.
rust/library/unwind/src/lib.rs
Lines 1 to 13 in 963844b
#![no_std] | |
#![unstable(feature = "panic_unwind", issue = "32837")] | |
#![feature(link_cfg)] | |
#![feature(staged_api)] | |
#![feature(c_unwind)] | |
#![feature(strict_provenance)] | |
#![cfg_attr(not(target_env = "msvc"), feature(libc))] | |
#![cfg_attr( | |
all(target_family = "wasm", not(target_os = "emscripten")), | |
feature(link_llvm_intrinsics) | |
)] | |
#![allow(internal_features)] | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, I will close this PR in favor of #122797 then. Though IMO it's weird that unreachable
on WASM64 requires simd_wasm64
feature.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that a mistake in core::arch
or does that intrinsic really require SIMD, but only on wasm64 and not wasm32?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@RalfJung I assume simd_wasm64
really just means "special architecture intrinsics and features for wasm64" because... people just see core::arch
and their brain shuts off kinda. I mean, all the architectural extension features were named stdsimd
once.
Use `arch::wasm::unreachable` instead of `arch::wasm32::unreachable` Closes rust-lang#122877
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#116016 (Soft-destabilize `RustcEncodable` & `RustcDecodable`, remove from prelude in next edition) - rust-lang#122460 (Rework rmake support library API) - rust-lang#122658 (ci: Build gccjit from a git archive) - rust-lang#122698 (Cancel `cargo update` job if there's no updates) - rust-lang#122878 (Use `arch::wasm::unreachable` instead of `arch::wasm32::unreachable`) - rust-lang#122915 (Delay a bug if no RPITITs were found) - rust-lang#122916 (docs(sync): normalize dot in fn summaries) - rust-lang#122921 (Enable more mir-opt tests in debug builds) - rust-lang#122922 (-Zprint-type-sizes: print the types of awaitees and unnamed coroutine locals.) r? `@ghost` `@rustbot` modify labels: rollup
taiki is correct. |
Closes #122877