Skip to content

Rustc pull update #1889

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.

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
merged 23 commits into from
Aug 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
db365f4
Auto merge of #143843 - JonathanBrouwer:macro-use-parser, r=oli-obk
bors Jul 23, 2025
c3fcfeb
Auto merge of #144233 - cjgillot:unsat-mir, r=oli-obk
bors Jul 23, 2025
dc94f2b
Auto merge of #144244 - jieyouxu:pr-full-ci, r=Kobzol
bors Jul 23, 2025
3f9d20c
Auto merge of #144062 - bjorn3:lto_refactors2, r=davidtwco
bors Jul 24, 2025
781d63c
Auto merge of #144389 - scottmcm:no-more-mir-cast-assume, r=davidtwco
bors Jul 24, 2025
75b706d
Allow ffi_unwind_calls for `arch::wasm32::throw`
purplesyringa Jul 25, 2025
ad7ec16
Auto merge of #143500 - compiler-errors:characterize-less, r=lcnr
bors Jul 26, 2025
718d0cc
Auto merge of #143860 - scottmcm:transmute-always-rvalue, r=WaffleLapkin
bors Jul 26, 2025
409809a
Auto merge of #144347 - scottmcm:ssa-enums-v0, r=WaffleLapkin
bors Jul 27, 2025
bc62f19
Auto merge of #144425 - nnethercote:avoid-new_adt-new_fn_def, r=compi…
bors Jul 27, 2025
8affbcc
Auto merge of #144434 - nnethercote:preintern-ty-bounds, r=compiler-e…
bors Jul 27, 2025
5459a29
Auto merge of #144225 - purplesyringa:unwinding-intrinsics, r=nikic
bors Jul 27, 2025
b27a14b
Auto merge of #144556 - matthiaskrgr:rollup-aayo3h5, r=matthiaskrgr
bors Jul 28, 2025
90828dd
Auto merge of #144469 - Kivooeo:chains-cleanup, r=SparrowLii
bors Jul 28, 2025
3ca0b63
Auto merge of #144543 - scottmcm:more-sroa, r=cjgillot
bors Jul 28, 2025
c83c7a9
Auto merge of #144524 - rust-lang:cargo_update, r=clubby789
bors Jul 28, 2025
393e76e
Auto merge of #144557 - cjgillot:lower-more-span, r=compiler-errors
bors Jul 29, 2025
7401d83
Auto merge of #144393 - heiher:str-contains-lsx, r=tgross35
bors Jul 29, 2025
1e5d22c
Auto merge of #144305 - ChrisDenton:win-free-disk-space, r=marcoieni
bors Jul 30, 2025
5e6c41c
Auto merge of #116316 - cjgillot:incr-privacy, r=petrochenkov
bors Jul 30, 2025
56d8aa1
Auto merge of #144405 - lcnr:hir-typeck-uniquify, r=BoxyUwU
bors Jul 31, 2025
ae55f51
Prepare for merging from rust-lang/rust
invalid-email-address Jul 31, 2025
8bdae7f
Merge ref '32e7a4b92b10' from rust-lang/rust
invalid-email-address Jul 31, 2025
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
10 changes: 10 additions & 0 deletions crates/core_arch/src/wasm32/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,16 @@ unsafe extern "C-unwind" {
// #[cfg_attr(test, assert_instr(throw, TAG = 0, ptr = core::ptr::null_mut()))]
#[inline]
#[unstable(feature = "wasm_exception_handling_intrinsics", issue = "122465")]
// FIXME: Since this instruction unwinds, `core` built with `-C panic=unwind`
// cannot be linked with `-C panic=abort` programs. But that's not
// entirely supported anyway, because runtimes without EH support won't
// be able to handle `try` blocks in `-C panic=unwind` crates either.
// We ship `-C panic=abort` `core`, so this doesn't affect users
// directly. Resolving this will likely require patching out both `try`
// and `throw` instructions, at which point we can look into whitelisting
// this function in the compiler to allow linking.
// See https://github.com/rust-lang/rust/issues/118168.
#[allow(ffi_unwind_calls)]
pub unsafe fn throw<const TAG: i32>(ptr: *mut u8) -> ! {
static_assert!(TAG == 0); // LLVM only supports tag 0 == C++ right now.
wasm_throw(TAG, ptr)
Expand Down
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5a30e4307f0506bed87eeecd171f8366fdbda1dc
32e7a4b92b109c24e9822c862a7c74436b50e564
Loading