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

rustc_mir: do not treat NEEDS_DROP as unexpected in qualify_consts.

Browse source
This commit is contained in:
Eduard-Mihai Burtescu 2019-02-06 18:11:48 +02:00
parent 1d6332def3
commit 99fc3eff57
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/librustc_mir/transform/qualify_consts.rs
View file

@ -48,11 +48,6 @@ bitflags::bitflags! {
// Refers to temporaries which cannot be promoted as
// promote_consts decided they weren't simple enough.
const NOT_PROMOTABLE = 1 << 3;
// Const items can only have MUTABLE_INTERIOR
// and NOT_PROMOTABLE without producing an error.
const CONST_ERROR = !Qualif::MUTABLE_INTERIOR.bits &
!Qualif::NOT_PROMOTABLE.bits;
}
}
@ -419,13 +414,13 @@ impl<'a, 'tcx> Qualifier<'a, 'tcx> {
};
// Bail out on oon-`const fn` calls or if the callee had errors.
if !is_const_fn || self.qualify_operand(callee).intersects(Qualif::CONST_ERROR) {
if !is_const_fn || self.qualify_operand(callee).intersects(Qualif::NOT_CONST) {
return Qualif::NOT_CONST;
}
// Bail out if any arguments had errors.
for arg in args {
if self.qualify_operand(arg).intersects(Qualif::CONST_ERROR) {
if self.qualify_operand(arg).intersects(Qualif::NOT_CONST) {
return Qualif::NOT_CONST;
}
}
@ -668,7 +663,7 @@ impl<'a, 'tcx> Checker<'a, 'tcx> {
// Account for errors in consts by using the
// conservative type qualification instead.
if qualif.intersects(Qualif::CONST_ERROR) {
if qualif.intersects(Qualif::NOT_CONST) {
qualif = self.qualifier().qualify_any_value_of_ty(mir.return_ty());
}