Skip to content

Commit 51f061e

Browse files
committed
Auto merge of #151436 - jhpratt:rollup-Rp5KtGe, r=jhpratt
Rollup of 6 pull requests Successful merges: - rust-lang/rust#150436 (`c_variadic`: impl `va_copy` and `va_end` as Rust intrinsics) - rust-lang/rust#151340 (Port `#[patchable_function_entry]` to attr parser) - rust-lang/rust#151351 (Deduplicate diagnostics for const trait supertraits) - rust-lang/rust#151424 (missing colon after the compile-flags directive) - rust-lang/rust#151428 (Port variance attrs to attr parser.) - rust-lang/rust#151429 (s390x: Support aligned stack datalayout) Failed merges: - rust-lang/rust#151343 (Port some crate level attrs to the attribute parser) r? @ghost
2 parents 2707e8a + a225fa2 commit 51f061e

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/intrinsics/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
15061506
}
15071507

15081508
// FIXME implement variadics in cranelift
1509-
sym::va_copy | sym::va_arg | sym::va_end => {
1509+
sym::va_arg | sym::va_end => {
15101510
fx.tcx.dcx().span_fatal(
15111511
source_info.span,
15121512
"Defining variadic functions is not yet supported by Cranelift",

0 commit comments

Comments
 (0)