bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Pull out downcasting into caller of iter_variant

Browse source 
Renames iter_variant to iter_variant_fields to more clearly communicate
the purpose of the function.
This commit is contained in:
Mark Simulacrum 2017-01-03 20:16:36 -07:00
parent d25fc9ec5f
commit 7dadd14d6c
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/librustc_trans/glue.rs
View file

@ -395,22 +395,21 @@ pub fn size_and_align_of_dst<'a, 'tcx>(bcx: &Builder<'a, 'tcx>, t: Ty<'tcx>, inf
} }
// Iterates through the elements of a structural type, dropping them. // Iterates through the elements of a structural type, dropping them.
fn drop_structural_ty<'a, 'tcx>(cx: Builder<'a, 'tcx>, ptr: LvalueRef<'tcx>) -> Builder<'a, 'tcx> { fn drop_structural_ty<'a, 'tcx>(
fn iter_variant<'a, 'tcx>(cx: &'a Builder<'a, 'tcx>, cx: Builder<'a, 'tcx>,
av: LvalueRef<'tcx>, mut ptr: LvalueRef<'tcx>
adt_def: &'tcx AdtDef, ) -> Builder<'a, 'tcx> {
variant_index: usize, fn iter_variant_fields<'a, 'tcx>(
substs: &'tcx Substs<'tcx>) { cx: &'a Builder<'a, 'tcx>,
av: LvalueRef<'tcx>,
adt_def: &'tcx AdtDef,
variant_index: usize,
substs: &'tcx Substs<'tcx>
) {
let variant = &adt_def.variants[variant_index]; let variant = &adt_def.variants[variant_index];
let tcx = cx.tcx(); let tcx = cx.tcx();
for (i, field) in variant.fields.iter().enumerate() { for (i, field) in variant.fields.iter().enumerate() {
let arg = monomorphize::field_ty(tcx, substs, field); let arg = monomorphize::field_ty(tcx, substs, field);
let mut av = av.clone();
av.ty = LvalueTy::Downcast {
adt_def: adt_def,
substs: substs,
variant_index: variant_index,
};
let field_ptr = av.trans_field_ptr(&cx, i); let field_ptr = av.trans_field_ptr(&cx, i);
drop_ty(&cx, LvalueRef::new_sized_ty(field_ptr, arg)); drop_ty(&cx, LvalueRef::new_sized_ty(field_ptr, arg));
} }
@ -479,7 +478,12 @@ fn drop_structural_ty<'a, 'tcx>(cx: Builder<'a, 'tcx>, ptr: LvalueRef<'tcx>) ->
layout::UntaggedUnion { .. } => { layout::UntaggedUnion { .. } => {
if n_variants != 0 { if n_variants != 0 {
assert!(n_variants == 1); assert!(n_variants == 1);
iter_variant(&cx, ptr, &adt, 0, substs); ptr.ty = LvalueTy::Downcast {
adt_def: adt,
substs: substs,
variant_index: 0,
};
iter_variant_fields(&cx, ptr, &adt, 0, substs);
} }
} }
layout::CEnum { .. } | layout::CEnum { .. } |
@ -514,7 +518,12 @@ fn drop_structural_ty<'a, 'tcx>(cx: Builder<'a, 'tcx>, ptr: LvalueRef<'tcx>) ->
let variant_cx = cx.build_sibling_block(&variant_cx_name); let variant_cx = cx.build_sibling_block(&variant_cx_name);
let case_val = adt::trans_case(&cx, t, Disr::from(variant.disr_val)); let case_val = adt::trans_case(&cx, t, Disr::from(variant.disr_val));
variant_cx.add_case(llswitch, case_val, variant_cx.llbb()); variant_cx.add_case(llswitch, case_val, variant_cx.llbb());
iter_variant(&variant_cx, ptr, &adt, i, substs); ptr.ty = LvalueTy::Downcast {
adt_def: adt,
substs: substs,
variant_index: i,
};
iter_variant_fields(&variant_cx, ptr, &adt, i, substs);
variant_cx.br(next_cx.llbb()); variant_cx.br(next_cx.llbb());
} }
cx = next_cx; cx = next_cx;