bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Let codegen_get_discriminant accept CValue instead of CPlace

Browse source
This commit is contained in:
bjorn3 2019-08-18 16:19:33 +02:00
parent 5b818e5e0f
commit 1bee110d95
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/base.rs
View file

@ -367,10 +367,7 @@ fn trans_stmt<'a, 'tcx: 'a>(
_ => unreachable!("cast adt {} -> {}", from_ty, to_ty),
}
// FIXME avoid forcing to stack
let place =
CPlace::for_addr(operand.force_stack(fx), operand.layout());
let discr = crate::discriminant::codegen_get_discriminant(fx, place, fx.layout_of(to_ty));
let discr = crate::discriminant::codegen_get_discriminant(fx, operand, fx.layout_of(to_ty));
lval.write_cvalue(fx, discr);
} else {
let to_clif_ty = fx.clif_type(to_ty).unwrap();
@ -405,7 +402,8 @@ fn trans_stmt<'a, 'tcx: 'a>(
}
Rvalue::Discriminant(place) => {
let place = trans_place(fx, place);
let discr = crate::discriminant::codegen_get_discriminant(fx, place, dest_layout);
let value = place.to_cvalue(fx);
let discr = crate::discriminant::codegen_get_discriminant(fx, value, dest_layout);
lval.write_cvalue(fx, discr);
}
Rvalue::Repeat(operand, times) => {