From fe3a609b0b3e51423165320b356440047fe10a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= Date: Wed, 4 Nov 2015 16:18:15 +0100 Subject: [PATCH 1/3] [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. --- src/librustc_trans/trans/mir/mod.rs | 2 +- src/test/run-pass/mir_small_agg_arg.rs | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/test/run-pass/mir_small_agg_arg.rs 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 or the MIT license +// , 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)); +} From 5a35f498f38698ccf541968da8262f4686efe898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= Date: Wed, 4 Nov 2015 17:39:25 +0100 Subject: [PATCH 2/3] [MIR-trans] Fix handling of non-alloca temps in trans_operand_into() --- src/librustc_trans/trans/mir/operand.rs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/librustc_trans/trans/mir/operand.rs b/src/librustc_trans/trans/mir/operand.rs index a0308032ac0..fb529d8975e 100644 --- a/src/librustc_trans/trans/mir/operand.rs +++ b/src/librustc_trans/trans/mir/operand.rs @@ -92,19 +92,10 @@ impl<'bcx, 'tcx> MirContext<'bcx, 'tcx> { bcx.val_to_string(lldest), operand); - match *operand { - mir::Operand::Consume(ref lvalue) => { - let tr_lvalue = self.trans_lvalue(bcx, lvalue); - let lvalue_ty = tr_lvalue.ty.to_ty(bcx.tcx()); - debug!("trans_operand_into: tr_lvalue={} @ {:?}", - bcx.val_to_string(tr_lvalue.llval), - lvalue_ty); - base::memcpy_ty(bcx, lldest, tr_lvalue.llval, lvalue_ty); - } - - mir::Operand::Constant(..) => { - unimplemented!() - } - } + let o = self.trans_operand(bcx, operand); + match datum::appropriate_rvalue_mode(bcx.ccx(), o.ty) { + datum::ByValue => base::store_ty(bcx, o.llval, lldest, o.ty), + datum::ByRef => base::memcpy_ty(bcx, lldest, o.llval, o.ty), + }; } } From 3235b22ee38d159ab443785c806901a25682743c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= Date: Thu, 5 Nov 2015 16:18:45 +0100 Subject: [PATCH 3/3] Fix handling of fat pointer function arguments The store for the "extra" data went to the wrong destination. --- src/librustc_trans/trans/mir/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc_trans/trans/mir/mod.rs b/src/librustc_trans/trans/mir/mod.rs index 2f59362f740..75fb88ab5ee 100644 --- a/src/librustc_trans/trans/mir/mod.rs +++ b/src/librustc_trans/trans/mir/mod.rs @@ -169,7 +169,7 @@ fn arg_value_refs<'bcx, 'tcx>(bcx: Block<'bcx, 'tcx>, idx += 2; let lltemp = base::alloc_ty(bcx, arg_ty, &format!("arg{}", arg_index)); build::Store(bcx, lldata, expr::get_dataptr(bcx, lltemp)); - build::Store(bcx, llextra, expr::get_dataptr(bcx, lltemp)); + build::Store(bcx, llextra, expr::get_meta(bcx, lltemp)); lltemp } else { // otherwise, arg is passed by value, so make a