mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QUALIF_ERROR_BIT checking

Browse Source
This commit is contained in:
Dylan MacKenzie 2019-11-13 16:56:08 -08:00
parent 1bd30ce2aa
commit 1924cc8c7d
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/librustc_mir/transform/promote_consts.rs
View File

@ -582,30 +582,9 @@ impl<'tcx> Validator<'_, 'tcx> {
Operand::Copy(place) |
Operand::Move(place) => self.validate_place(place.as_ref()),
Operand::Constant(constant) => {
if let ty::ConstKind::Unevaluated(def_id, _) = constant.literal.val {
if self.tcx.trait_of_item(def_id).is_some() {
// Don't peek inside trait associated constants.
// (see below what we do for other consts, for now)
} else {
// HACK(eddyb) ensure that errors propagate correctly.
// FIXME(eddyb) remove this once the old promotion logic
// is gone - we can always promote constants even if they
// fail to pass const-checking, as compilation would've
// errored independently and promotion can't change that.
let bits = self.tcx.at(constant.span).mir_const_qualif(def_id);
if bits == super::qualify_consts::QUALIF_ERROR_BIT {
self.tcx.sess.delay_span_bug(
constant.span,
"promote_consts: MIR had errors",
);
return Err(Unpromotable);
}
}
}
Ok(())
}
// The qualifs for a constant (e.g. `HasMutInterior`) are checked in
// `validate_rvalue` upon access.
Operand::Constant(_) => Ok(()),
}
}

2
src/librustc_mir/transform/qualify_consts.rs
View File

@ -1285,7 +1285,7 @@ fn mir_const_qualif(tcx: TyCtxt<'_>, def_id: DefId) -> u8 {
if body.return_ty().references_error() {
tcx.sess.delay_span_bug(body.span, "mir_const_qualif: MIR had errors");
return QUALIF_ERROR_BIT;
return 0;
}
Checker::new(tcx, def_id, body, Mode::Const).check_const()