Skip to content

Commit d6db951

Browse files
author
Folkert de Vries
committed
only run pass-by-value-abi on 64-bit windows
the 32-bit variant differs only in the alignment/size, and I can't test it locally
1 parent 0897974 commit d6db951

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

tests/ui/c-variadic/pass-by-value-abi.aarch64.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
7171
conv: C,
7272
can_unwind: false,
7373
}
74-
--> $DIR/pass-by-value-abi.rs:26:1
74+
--> $DIR/pass-by-value-abi.rs:27:1
7575
|
7676
LL | pub extern "C" fn take_va_list(_: VaList<'_>) {}
7777
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/c-variadic/pass-by-value-abi.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
//@ [aarch64] ignore-windows
1313
//@ [aarch64] ignore-apple
1414
//@ [aarch64] ignore-uefi
15-
// Windows dosen't use `#[rustc_pass_indirectly_in_non_rustic_abis]` and is tested in CI, so is here
15+
// Windows doesn't use `#[rustc_pass_indirectly_in_non_rustic_abis]` and is tested in CI, so is here
1616
// for comparison.
1717
//@ [win] only-windows
18+
//@ [win] only-x86_64
1819

1920
#![feature(rustc_attrs, c_variadic)]
2021
#![crate_type = "lib"]

tests/ui/c-variadic/pass-by-value-abi.win.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
7474
conv: C,
7575
can_unwind: false,
7676
}
77-
--> $DIR/pass-by-value-abi.rs:26:1
77+
--> $DIR/pass-by-value-abi.rs:27:1
7878
|
7979
LL | pub extern "C" fn take_va_list(_: VaList<'_>) {}
8080
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/c-variadic/pass-by-value-abi.x86_64.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
7171
conv: C,
7272
can_unwind: false,
7373
}
74-
--> $DIR/pass-by-value-abi.rs:26:1
74+
--> $DIR/pass-by-value-abi.rs:27:1
7575
|
7676
LL | pub extern "C" fn take_va_list(_: VaList<'_>) {}
7777
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -151,7 +151,7 @@ error: fn_abi_of(take_va_list_sysv64) = FnAbi {
151151
),
152152
can_unwind: false,
153153
}
154-
--> $DIR/pass-by-value-abi.rs:36:1
154+
--> $DIR/pass-by-value-abi.rs:37:1
155155
|
156156
LL | pub extern "sysv64" fn take_va_list_sysv64(_: VaList<'_>) {}
157157
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -231,7 +231,7 @@ error: fn_abi_of(take_va_list_win64) = FnAbi {
231231
),
232232
can_unwind: false,
233233
}
234-
--> $DIR/pass-by-value-abi.rs:43:1
234+
--> $DIR/pass-by-value-abi.rs:44:1
235235
|
236236
LL | pub extern "win64" fn take_va_list_win64(_: VaList<'_>) {}
237237
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)