-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auto merge of #12762 : klutzy/rust/win-struct-abi, r=alexcrichton
This fixes struct passing abi on x86 ffi: Structs are now passed indirectly with byval attribute (as clang does). Empty structs are also explicitly ignored rather than directly passed. Fixes #5744 Fixes #11198 Fixes #11343
- Loading branch information
Showing
7 changed files
with
120 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// Test a foreign function that accepts empty struct. | ||
|
||
struct TwoU8s { | ||
one: u8, | ||
two: u8, | ||
} | ||
|
||
struct ManyInts { | ||
arg1: i8, | ||
arg2: i16, | ||
arg3: i32, | ||
arg4: i16, | ||
arg5: i8, | ||
arg6: TwoU8s, | ||
} | ||
|
||
struct Empty; | ||
|
||
#[link(name = "rustrt")] | ||
extern { | ||
fn rust_dbg_extern_empty_struct(v1: ManyInts, e: Empty, v2: ManyInts); | ||
} | ||
|
||
pub fn main() { | ||
unsafe { | ||
let x = ManyInts { | ||
arg1: 2, | ||
arg2: 3, | ||
arg3: 4, | ||
arg4: 5, | ||
arg5: 6, | ||
arg6: TwoU8s { one: 7, two: 8, } | ||
}; | ||
let y = ManyInts { | ||
arg1: 1, | ||
arg2: 2, | ||
arg3: 3, | ||
arg4: 4, | ||
arg5: 5, | ||
arg6: TwoU8s { one: 6, two: 7, } | ||
}; | ||
let empty = Empty; | ||
rust_dbg_extern_empty_struct(x, empty, y); | ||
} | ||
} |