Skip to content

Commit 933b21a

Browse files
authored
Rollup merge of rust-lang#110233 - nbdd0121:intrinsic, r=tmiasko
Make rust-intrinsic ABI unwindable Fix rust-lang#104451, fix rust-lang/miri#2839 r? `@RalfJung`
2 parents b45ecd6 + 27a8e24 commit 933b21a

File tree

4 files changed

+236
-1
lines changed

4 files changed

+236
-1
lines changed

core/src/ffi/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,12 +615,15 @@ impl<'f> Drop for VaListImpl<'f> {
615615
extern "rust-intrinsic" {
616616
/// Destroy the arglist `ap` after initialization with `va_start` or
617617
/// `va_copy`.
618+
#[rustc_nounwind]
618619
fn va_end(ap: &mut VaListImpl<'_>);
619620

620621
/// Copies the current location of arglist `src` to the arglist `dst`.
622+
#[rustc_nounwind]
621623
fn va_copy<'f>(dest: *mut VaListImpl<'f>, src: &VaListImpl<'f>);
622624

623625
/// Loads an argument of type `T` from the `va_list` `ap` and increment the
624626
/// argument `ap` points to.
627+
#[rustc_nounwind]
625628
fn va_arg<T: sealed_trait::VaArgSafe>(ap: &mut VaListImpl<'_>) -> T;
626629
}

0 commit comments

Comments
 (0)