about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-26 17:23:42 +0000
committerbors <bors@rust-lang.org>2016-12-26 17:23:42 +0000
commitf536d90c789e973c95dfc4a699c047186e4fb59c (patch)
tree43245decb9f2d19a110b9efe583edaca8c3283f3 /src/rustllvm/RustWrapper.cpp
parent65c043fdd291a9e683b834c800204ec68c9988f1 (diff)
parent5e2cea9a4e270544d48ee7634ef3a7b6f67163a4 (diff)
downloadrust-f536d90c789e973c95dfc4a699c047186e4fb59c.tar.gz
rust-f536d90c789e973c95dfc4a699c047186e4fb59c.zip
Auto merge of #38542 - YaLTeR:fastcall-fix, r=pnkfelix
Fix fastcall not applying inreg attributes to arguments

Fixes https://github.com/rust-lang/rust/issues/18086
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
-rw-r--r--src/rustllvm/RustWrapper.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index f5fa66f1b0e..5d5845213e2 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -150,6 +150,8 @@ from_rust(LLVMRustAttribute kind) {
       return Attribute::UWTable;
     case ZExt:
       return Attribute::ZExt;
+    case InReg:
+      return Attribute::InReg;
     default:
       llvm_unreachable("bad AttributeKind");
   }