user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Evaluate 128 lowering lang items manually

Browse source
This commit is contained in:
Oliver Schneider 2018-01-14 13:04:02 +01:00 • committed by Oliver Schneider
parent b33e4e784e
commit 246d05b624
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_mir/const_eval/pattern.rs
View file

@ -836,7 +836,7 @@ impl<'a, 'tcx> PatternContext<'a, 'tcx> {
}
},
ty::TyAdt(adt_def, _) => {
let struct_var = adt_def.struct_variant();
let struct_var = adt_def.non_enum_variant();
PatternKind::Leaf {
subpatterns: struct_var.fields.iter().enumerate().map(|(i, _)| {
let field = Field::new(i);

28
src/librustc_mir/interpret/const_eval.rs
View file

@ -205,15 +205,29 @@ impl<'mir, 'tcx> super::Machine<'mir, 'tcx> for CompileTimeEvaluator {
ecx: &mut EvalContext<'a, 'mir, 'tcx, Self>,
instance: ty::Instance<'tcx>,
destination: Option<(Place, mir::BasicBlock)>,
_args: &[ValTy<'tcx>],
args: &[ValTy<'tcx>],
span: Span,
_sig: ty::FnSig<'tcx>,
sig: ty::FnSig<'tcx>,
) -> EvalResult<'tcx, bool> {
debug!("eval_fn_call: {:?}", instance);
if !ecx.tcx.is_const_fn(instance.def_id()) {
return Err(
ConstEvalError::NotConst(format!("calling non-const fn `{}`", instance)).into(),
);
let def_id = instance.def_id();
let (op, oflo) = if let Some(op) = ecx.tcx.is_binop_lang_item(def_id) {
op
} else {
return Err(
ConstEvalError::NotConst(format!("calling non-const fn `{}`", instance)).into(),
);
};
let (dest, bb) = destination.expect("128 lowerings can't diverge");
let dest_ty = sig.output();
if oflo {
ecx.intrinsic_with_overflow(op, args[0], args[1], dest, dest_ty)?;
} else {
ecx.intrinsic_overflowing(op, args[0], args[1], dest, dest_ty)?;
}
ecx.goto_block(bb);
return Ok(true);
}
let mir = match ecx.load_mir(instance.def) {
Ok(mir) => mir,
@ -472,8 +486,8 @@ pub fn const_eval_provider<'a, 'tcx>(
ecx.report(&mut err, true);
}
ConstEvalErr {
kind: err.into(),
span,
kind: err.into(),
span,
}
})
}