Skip to content

ignore {std,fast,vector,this}call on non-x86 windows #54576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/librustc_target/spec/mod.rs
Original file line number Diff line number Diff line change
@@ -761,7 +761,7 @@ impl Default for TargetOptions {
}

impl Target {
/// Given a function ABI, turn "System" into the correct ABI for this target.
/// Given a function ABI, turn it into the correct ABI for this target.
pub fn adjust_abi(&self, abi: Abi) -> Abi {
match abi {
Abi::System => {
@@ -771,6 +771,16 @@ impl Target {
Abi::C
}
},
// These ABI kinds are ignored on non-x86 Windows targets.
// See https://docs.microsoft.com/en-us/cpp/cpp/argument-passing-and-naming-conventions
// and the individual pages for __stdcall et al.
Abi::Stdcall | Abi::Fastcall | Abi::Vectorcall | Abi::Thiscall => {
if self.options.is_like_windows && self.arch != "x86" {
Abi::C
} else {
abi
}
},
abi => abi
}
}
5 changes: 3 additions & 2 deletions src/test/codegen/issue-32364.rs
Original file line number Diff line number Diff line change
@@ -8,8 +8,9 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-arm
// ignore-aarch64
// Test that `extern "stdcall"` is properly translated.

// only-x86

// compile-flags: -C no-prepopulate-passes