Skip to content

Commit

Permalink
trans: use Pair for ignored nil pairs instead of Immediate.
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyb committed Jun 6, 2016
1 parent 8cbffc5 commit b6d9f83
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/librustc_trans/mir/mod.rs
Expand Up @@ -124,7 +124,12 @@ impl<'tcx> TempRef<'tcx> {
// Zero-size temporaries aren't always initialized, which
// doesn't matter because they don't contain data, but
// we need something in the operand.
let val = OperandValue::Immediate(common::C_nil(ccx));
let nil = common::C_nil(ccx);
let val = if common::type_is_imm_pair(ccx, ty) {
OperandValue::Pair(nil, nil)
} else {
OperandValue::Immediate(nil)
};
let op = OperandRef {
val: val,
ty: ty
Expand Down
12 changes: 12 additions & 0 deletions src/test/run-pass/mir_trans_calls.rs
Expand Up @@ -147,6 +147,16 @@ fn test_fn_transmute_zst(x: ()) -> [(); 1] {
})
}

#[rustc_mir]
fn test_fn_ignored_pair() -> ((), ()) {
((), ())
}

#[rustc_mir]
fn test_fn_ignored_pair_0() {
test_fn_ignored_pair().0
}

fn main() {
assert_eq!(test1(1, (2, 3), &[4, 5, 6]), (1, (2, 3), &[4, 5, 6][..]));
assert_eq!(test2(98), 98);
Expand All @@ -169,4 +179,6 @@ fn main() {

assert_eq!(test_fn_nil_call(&(|| 42)), 42);
assert_eq!(test_fn_transmute_zst(()), [()]);

assert_eq!(test_fn_ignored_pair_0(), ());
}

0 comments on commit b6d9f83

Please sign in to comment.