bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #90203 - matthiaskrgr:rollup-v215wew, r=matthiaskrgr

Browse source 
Rollup of 5 pull requests

Successful merges:

 - #85833 (Scrape code examples from examples/ directory for Rustdoc)
 - #88041 (Make all proc-macro back-compat lints deny-by-default)
 - #89829 (Consider types appearing in const expressions to be invariant)
 - #90168 (Reset qualifs when a storage of a local ends)
 - #90198 (Add caveat about changing parallelism and function call overhead)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2021-10-23 15:53:50 +00:00
commit 91b931926f
57 changed files with 1281 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_const_eval/src/transform/check_consts/resolver.rs
View file

@ -4,7 +4,7 @@
use rustc_index::bit_set::BitSet;
use rustc_middle::mir::visit::Visitor;
use rustc_middle::mir::{self, BasicBlock, Local, Location};
use rustc_middle::mir::{self, BasicBlock, Local, Location, Statement, StatementKind};
use std::marker::PhantomData;
@ -120,6 +120,15 @@ where
self.super_assign(place, rvalue, location);
}
fn visit_statement(&mut self, statement: &Statement<'tcx>, location: Location) {
match statement.kind {
StatementKind::StorageDead(local) => {
self.qualifs_per_local.remove(local);
}
_ => self.super_statement(statement, location),
}
}
fn visit_terminator(&mut self, terminator: &mir::Terminator<'tcx>, location: Location) {
// The effect of assignment to the return place in `TerminatorKind::Call` is not applied
// here; that occurs in `apply_call_return_effect`.