Skip to content

Commit fae0515

Browse files
committed
Auto merge of #155674 - JonathanBrouwer:rollup-NG1fnzG, r=JonathanBrouwer
Rollup of 10 pull requests Successful merges: - rust-lang/rust#146544 (mir-opt: Remove the workaround in UnreachableEnumBranching) - rust-lang/rust#154819 (Fix ICE for inherent associated type mismatches) - rust-lang/rust#155265 (Improved assumptions relating to isqrt) - rust-lang/rust#152576 (c-variadic: use `emit_ptr_va_arg` for mips) - rust-lang/rust#154481 (Mark a function only used in nightly as nightly only) - rust-lang/rust#155614 (c-variadic: rename `VaList::arg` to `VaList::next_arg`) - rust-lang/rust#155630 (Make `//@ skip-filecheck` a normal compiletest directive) - rust-lang/rust#155641 (Remove non-working code for "running" mir-opt tests) - rust-lang/rust#155652 (Expand `Path::is_empty` docs) - rust-lang/rust#155656 (rustc_llvm: update opt-level handling for LLVM 23)
2 parents 2368991 + ba62a7f commit fae0515

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

tests/fail/c-variadic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
fn read_too_many() {
66
unsafe extern "C" fn variadic(mut ap: ...) {
7-
ap.arg::<i32>();
7+
ap.next_arg::<i32>();
88
}
99

1010
unsafe { variadic() };

tests/fail/c-variadic.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | unsafe { va_arg(self) }
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: stack backtrace:
10-
0: std::ffi::VaList::<'_>::arg
10+
0: std::ffi::VaList::<'_>::next_arg
1111
at RUSTLIB/core/src/ffi/va_list.rs:LL:CC
1212
1: read_too_many::variadic
1313
at tests/fail/c-variadic.rs:LL:CC

tests/pass/c-variadic-ignored-argument.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
fn main() {
1515
unsafe extern "C" fn variadic(mut ap: ...) {
16-
ap.arg::<i32>();
17-
ap.arg::<i32>();
16+
ap.next_arg::<i32>();
17+
ap.next_arg::<i32>();
1818
}
1919

2020
unsafe { variadic(0i32, (), 1i32) }

tests/pass/c-variadic.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fn ignores_arguments() {
1111

1212
fn echo() {
1313
unsafe extern "C" fn variadic(mut ap: ...) -> i32 {
14-
ap.arg()
14+
ap.next_arg()
1515
}
1616

1717
assert_eq!(unsafe { variadic(1) }, 1);
@@ -20,7 +20,7 @@ fn echo() {
2020

2121
fn forward_by_val() {
2222
unsafe fn helper(mut ap: VaList) -> i32 {
23-
ap.arg()
23+
ap.next_arg()
2424
}
2525

2626
unsafe extern "C" fn variadic(ap: ...) -> i32 {
@@ -33,7 +33,7 @@ fn forward_by_val() {
3333

3434
fn forward_by_ref() {
3535
unsafe fn helper(ap: &mut VaList) -> i32 {
36-
ap.arg()
36+
ap.next_arg()
3737
}
3838

3939
unsafe extern "C" fn variadic(mut ap: ...) -> i32 {
@@ -47,7 +47,7 @@ fn forward_by_ref() {
4747
#[allow(improper_ctypes_definitions)]
4848
fn nested() {
4949
unsafe fn helper(mut ap1: VaList, mut ap2: VaList) -> (i32, i32) {
50-
(ap1.arg(), ap2.arg())
50+
(ap1.next_arg(), ap2.next_arg())
5151
}
5252

5353
unsafe extern "C" fn variadic2(ap1: VaList, ap2: ...) -> (i32, i32) {
@@ -83,13 +83,13 @@ fn various_types() {
8383
}
8484
}
8585

86-
continue_if!(ap.arg::<c_double>().floor() == 3.14f64.floor());
87-
continue_if!(ap.arg::<c_long>() == 12);
88-
continue_if!(ap.arg::<c_int>() == 'a' as c_int);
89-
continue_if!(ap.arg::<c_double>().floor() == 6.18f64.floor());
90-
continue_if!(compare_c_str(ap.arg::<*const c_char>(), "Hello"));
91-
continue_if!(ap.arg::<c_int>() == 42);
92-
continue_if!(compare_c_str(ap.arg::<*const c_char>(), "World"));
86+
continue_if!(ap.next_arg::<c_double>().floor() == 3.14f64.floor());
87+
continue_if!(ap.next_arg::<c_long>() == 12);
88+
continue_if!(ap.next_arg::<c_int>() == 'a' as c_int);
89+
continue_if!(ap.next_arg::<c_double>().floor() == 6.18f64.floor());
90+
continue_if!(compare_c_str(ap.next_arg::<*const c_char>(), "Hello"));
91+
continue_if!(ap.next_arg::<c_int>() == 42);
92+
continue_if!(compare_c_str(ap.next_arg::<*const c_char>(), "World"));
9393
}
9494

9595
unsafe {

0 commit comments

Comments
 (0)