Skip to content

Commit a98f116

Browse files
authored
Unrolled build for rust-lang#136005
Rollup merge of rust-lang#136005 - BLANKatGITHUB:library, r=RalfJung ports last few library files to new intrinsic style This pr ports the last 2 library files to new intrinsic style this pr is part of issue rust-lang#132735
2 parents 6fb0358 + 72e5149 commit a98f116

File tree

2 files changed

+957
-677
lines changed

2 files changed

+957
-677
lines changed

library/core/src/ffi/va_list.rs

+22-12
Original file line numberDiff line numberDiff line change
@@ -302,18 +302,28 @@ impl<'f> Drop for VaListImpl<'f> {
302302
}
303303
}
304304

305-
extern "rust-intrinsic" {
306-
/// Destroy the arglist `ap` after initialization with `va_start` or
307-
/// `va_copy`.
308-
#[rustc_nounwind]
309-
fn va_end(ap: &mut VaListImpl<'_>);
305+
/// Destroy the arglist `ap` after initialization with `va_start` or
306+
/// `va_copy`.
307+
#[rustc_intrinsic]
308+
#[rustc_intrinsic_must_be_overridden]
309+
#[rustc_nounwind]
310+
unsafe fn va_end(_ap: &mut VaListImpl<'_>) {
311+
unreachable!()
312+
}
310313

311-
/// Copies the current location of arglist `src` to the arglist `dst`.
312-
#[rustc_nounwind]
313-
fn va_copy<'f>(dest: *mut VaListImpl<'f>, src: &VaListImpl<'f>);
314+
/// Copies the current location of arglist `src` to the arglist `dst`.
315+
#[rustc_intrinsic]
316+
#[rustc_intrinsic_must_be_overridden]
317+
#[rustc_nounwind]
318+
unsafe fn va_copy<'f>(_dest: *mut VaListImpl<'f>, _src: &VaListImpl<'f>) {
319+
unreachable!()
320+
}
314321

315-
/// Loads an argument of type `T` from the `va_list` `ap` and increment the
316-
/// argument `ap` points to.
317-
#[rustc_nounwind]
318-
fn va_arg<T: sealed_trait::VaArgSafe>(ap: &mut VaListImpl<'_>) -> T;
322+
/// Loads an argument of type `T` from the `va_list` `ap` and increment the
323+
/// argument `ap` points to.
324+
#[rustc_intrinsic]
325+
#[rustc_intrinsic_must_be_overridden]
326+
#[rustc_nounwind]
327+
unsafe fn va_arg<T: sealed_trait::VaArgSafe>(_ap: &mut VaListImpl<'_>) -> T {
328+
unreachable!()
319329
}

0 commit comments

Comments
 (0)