nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 12:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate some code

Browse Source
This commit is contained in:
Oliver Schneider 2018-02-22 09:37:20 +01:00
parent df283df887
commit 889a4ebfa9
No known key found for this signature in database
GPG Key ID: A69F8D225B3AD7D9
1 changed files with 67 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/librustc/ty/mod.rs
View File

@ -1824,15 +1824,13 @@ impl<'a, 'gcx, 'tcx> AdtDef {
} }
#[inline] #[inline]
pub fn discriminants(&'a self, tcx: TyCtxt<'a, 'gcx, 'tcx>) fn eval_explicit_discr(
-> impl Iterator<Item=Discr<'tcx>> + 'a { &self,
tcx: TyCtxt<'a, 'gcx, 'tcx>,
expr_did: DefId,
) -> Option<Discr<'tcx>> {
let param_env = ParamEnv::empty(traits::Reveal::UserFacing); let param_env = ParamEnv::empty(traits::Reveal::UserFacing);
let repr_type = self.repr.discr_type(); let repr_type = self.repr.discr_type();
let initial = repr_type.initial_discriminant(tcx.global_tcx());
let mut prev_discr = None::<Discr<'tcx>>;
self.variants.iter().map(move |v| {
let mut discr = prev_discr.map_or(initial, |d| d.wrap_incr(tcx));
if let VariantDiscr::Explicit(expr_did) = v.discr {
let substs = Substs::identity_for_item(tcx.global_tcx(), expr_did); let substs = Substs::identity_for_item(tcx.global_tcx(), expr_did);
let instance = ty::Instance::new(expr_did, substs); let instance = ty::Instance::new(expr_did, substs);
let cid = GlobalId { let cid = GlobalId {
@ -1863,15 +1861,15 @@ impl<'a, 'gcx, 'tcx> AdtDef {
// sign extend to i128 // sign extend to i128
let amt = 128 - size; let amt = 128 - size;
let val = (val << amt) >> amt; let val = (val << amt) >> amt;
discr = Discr { Some(Discr {
val: val as u128, val: val as u128,
ty, ty,
}; })
} else { } else {
discr = Discr { Some(Discr {
val: b, val: b,
ty, ty,
}; })
} }
} }
_ => { _ => {
@ -1880,9 +1878,24 @@ impl<'a, 'gcx, 'tcx> AdtDef {
"variant discriminant evaluation succeeded \ "variant discriminant evaluation succeeded \
in its crate but failed locally"); in its crate but failed locally");
} }
None
} }
} }
} }
#[inline]
pub fn discriminants(&'a self, tcx: TyCtxt<'a, 'gcx, 'tcx>)
-> impl Iterator<Item=Discr<'tcx>> + 'a {
let repr_type = self.repr.discr_type();
let initial = repr_type.initial_discriminant(tcx.global_tcx());
let mut prev_discr = None::<Discr<'tcx>>;
self.variants.iter().map(move |v| {
let mut discr = prev_discr.map_or(initial, |d| d.wrap_incr(tcx));
if let VariantDiscr::Explicit(expr_did) = v.discr {
if let Some(new_discr) = self.eval_explicit_discr(tcx, expr_did) {
discr = new_discr;
}
}
prev_discr = Some(discr); prev_discr = Some(discr);
discr discr
@ -1898,7 +1911,6 @@ impl<'a, 'gcx, 'tcx> AdtDef {
tcx: TyCtxt<'a, 'gcx, 'tcx>, tcx: TyCtxt<'a, 'gcx, 'tcx>,
variant_index: usize) variant_index: usize)
-> Discr<'tcx> { -> Discr<'tcx> {
let param_env = ParamEnv::empty(traits::Reveal::UserFacing);
let repr_type = self.repr.discr_type(); let repr_type = self.repr.discr_type();
let mut explicit_value = repr_type.initial_discriminant(tcx.global_tcx()); let mut explicit_value = repr_type.initial_discriminant(tcx.global_tcx());
let mut explicit_index = variant_index; let mut explicit_index = variant_index;
@ -1909,30 +1921,12 @@ impl<'a, 'gcx, 'tcx> AdtDef {
explicit_index -= distance; explicit_index -= distance;
} }
ty::VariantDiscr::Explicit(expr_did) => { ty::VariantDiscr::Explicit(expr_did) => {
let substs = Substs::identity_for_item(tcx.global_tcx(), expr_did); match self.eval_explicit_discr(tcx, expr_did) {
let instance = ty::Instance::new(expr_did, substs); Some(discr) => {
let cid = GlobalId { explicit_value = discr;
instance,
promoted: None
};
match tcx.const_eval(param_env.and(cid)) {
Ok(&ty::Const {
val: ConstVal::Value(Value::ByVal(PrimVal::Bytes(b))),
..
}) => {
trace!("discriminants: {} ({:?})", b, repr_type);
explicit_value = Discr {
val: b,
ty: repr_type.to_ty(tcx),
};
break; break;
} },
_ => { None => {
if !expr_did.is_local() {
span_bug!(tcx.def_span(expr_did),
"variant discriminant evaluation succeeded \
in its crate but failed locally");
}
if explicit_index == 0 { if explicit_index == 0 {
break; break;
} }