Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add missing attributes to indirect calls for foreign functions
When calling a foreign function, some arguments and/or return value attributes are required to conform to the foreign ABI. Currently those attributes are only added to the declaration of foreign functions. With direct calls, this is no problem, because LLVM can see that those attributes apply to the call. But with an indirect call, LLVM cannot do that and the attribute is missing. To fix that, we have to add those attribute to the calls to foreign functions as well. This also allows to remove the special handling of the SRet attribute, which is ABI-dependent and will be set via the `attr` field of the return type's `ArgType`.
- Loading branch information
Showing
3 changed files
with
82 additions
and
5 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
// 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. | ||
|
||
pub struct S { | ||
x: u64, | ||
y: u64, | ||
z: u64, | ||
} | ||
|
||
#[link(name = "rust_test_helpers")] | ||
extern { | ||
pub fn get_x(x: S) -> u64; | ||
pub fn get_y(x: S) -> u64; | ||
pub fn get_z(x: S) -> u64; | ||
} | ||
|
||
#[inline(never)] | ||
fn indirect_call(func: unsafe extern fn(s: S) -> u64, s: S) -> u64 { | ||
unsafe { | ||
func(s) | ||
} | ||
} | ||
|
||
fn main() { | ||
let s = S { x: 1, y: 2, z: 3 }; | ||
assert_eq!(s.x, indirect_call(get_x, s)); | ||
assert_eq!(s.y, indirect_call(get_y, s)); | ||
assert_eq!(s.z, indirect_call(get_z, s)); | ||
} |