diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-05-27 20:54:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 20:54:02 -0600 |
| commit | 4e5812cee45f02ac157392dc921c50da3eccd5ff (patch) | |
| tree | f552bc10ca33fa5bd0c9d66392febdf48fabc6c7 /src/test | |
| parent | 04a3b4708768a72db9c69684af47640223386eaf (diff) | |
| parent | bf87e17cd67805e3d1e5f422c4e8fa2b0e9a3ae7 (diff) | |
| download | rust-4e5812cee45f02ac157392dc921c50da3eccd5ff.tar.gz rust-4e5812cee45f02ac157392dc921c50da3eccd5ff.zip | |
Rollup merge of #42249 - Mark-Simulacrum:issue-40244, r=eddyb
Allow variadic functions with cdecl calling convention. Fixes #40244.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/E0045.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/variadic-ffi-2.rs | 6 | ||||
| -rw-r--r-- | src/test/compile-fail/variadic-ffi.rs | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/test/compile-fail/E0045.rs b/src/test/compile-fail/E0045.rs index a3fea8e0db2..3f098861eb6 100644 --- a/src/test/compile-fail/E0045.rs +++ b/src/test/compile-fail/E0045.rs @@ -9,7 +9,7 @@ // except according to those terms. extern "Rust" { fn foo(x: u8, ...); } //~ ERROR E0045 - //~| NOTE variadics require C calling conventions + //~| NOTE variadics require C or cdecl calling convention fn main() { } diff --git a/src/test/compile-fail/variadic-ffi-2.rs b/src/test/compile-fail/variadic-ffi-2.rs index afcad9d8f96..ec5669f6392 100644 --- a/src/test/compile-fail/variadic-ffi-2.rs +++ b/src/test/compile-fail/variadic-ffi-2.rs @@ -8,8 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn baz(f: extern "cdecl" fn(usize, ...)) { - //~^ ERROR: variadic function must have C calling convention +// ignore-arm stdcall isn't suppported + +fn baz(f: extern "stdcall" fn(usize, ...)) { + //~^ ERROR: variadic function must have C or cdecl calling convention f(22, 44); } diff --git a/src/test/compile-fail/variadic-ffi.rs b/src/test/compile-fail/variadic-ffi.rs index af2b552e20f..125177efc53 100644 --- a/src/test/compile-fail/variadic-ffi.rs +++ b/src/test/compile-fail/variadic-ffi.rs @@ -8,8 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern "cdecl" { - fn printf(_: *const u8, ...); //~ ERROR: variadic function must have C calling convention +// ignore-arm stdcall isn't suppported + +extern "stdcall" { + fn printf(_: *const u8, ...); //~ ERROR: variadic function must have C or cdecl calling } extern { |