[MIR-trans] Fix handling of small aggregate arguments

Function arguments that are small aggregates get passed as integer types
instead. To correctly handle that, we need to use store_ty instead of
plain Store.

2 files changed, 20 insertions, 1 deletions

diff --git a/src/librustc_trans/trans/mir/mod.rs b/src/librustc_trans/trans/mir/mod.rs
index 3b018cc1321..2f59362f740 100644
--- a/src/librustc_trans/trans/mir/mod.rs
+++ b/src/librustc_trans/trans/mir/mod.rs
@@ -177,7 +177,7 @@ fn arg_value_refs<'bcx, 'tcx>(bcx: Block<'bcx, 'tcx>,
                let llarg = llvm::get_param(fcx.llfn, idx);
                idx += 1;
                let lltemp = base::alloc_ty(bcx, arg_ty, &format!("arg{}", arg_index));
-               build::Store(bcx, llarg, lltemp);
+               base::store_ty(bcx, llarg, lltemp, arg_ty);
                lltemp
            };
            LvalueRef::new(llval, LvalueTy::from_ty(arg_ty))
diff --git a/src/test/run-pass/mir_small_agg_arg.rs b/src/test/run-pass/mir_small_agg_arg.rs
new file mode 100644
index 00000000000..8a0cb046b7a
--- /dev/null
+++ b/src/test/run-pass/mir_small_agg_arg.rs
@@ -0,0 +1,19 @@
+// Copyright 2015 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.
+
+#![feature(rustc_attrs)]
+
+#[rustc_mir]
+fn foo((x, y): (i8, i8)) {
+}
+
+fn main() {
+    foo((0, 1));
+}