Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rustc: Fix x86 ffi for empty struct arguments
- Loading branch information
Showing
5 changed files
with
111 additions
and
2 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
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); | ||
} | ||
} |
2d31bca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at klutzy@2d31bca
2d31bca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging klutzy/rust/win-struct-abi = 2d31bca into auto
2d31bca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
klutzy/rust/win-struct-abi = 2d31bca merged ok, testing candidate = 61d5bc5
2d31bca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4750
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4747
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/3845
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3853
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/4851
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/3939
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3945
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/4853
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/3939
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/3944
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/4011
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1744
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/4849
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/3950
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3958
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/4611
2d31bca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 61d5bc5