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

Explicitly list all ExprKinds in cfg_build

Browse Source 
Also rearranges the existing arms to be more logical. For example, Break
and Continue come closer to Loop now.
This commit is contained in:
Eric Holk 2021-12-16 12:38:08 -08:00
parent 4a70de7932
commit 6e281a7782
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
compiler/rustc_typeck/src/check/generator_interior/drop_ranges/cfg_build.rs
View File

@ -103,6 +103,12 @@ impl<'tcx> Visitor<'tcx> for DropRangeVisitor<'tcx> {
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) { fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
let mut reinit = None; let mut reinit = None;
match expr.kind { match expr.kind {
ExprKind::Assign(lhs, rhs, _) => {
self.visit_expr(lhs);
self.visit_expr(rhs);
reinit = Some(lhs);
}
ExprKind::If(test, if_true, if_false) => { ExprKind::If(test, if_true, if_false) => {
self.visit_expr(test); self.visit_expr(test);
@ -119,17 +125,6 @@ impl<'tcx> Visitor<'tcx> for DropRangeVisitor<'tcx> {
self.drop_ranges.add_control_edge(true_end, self.expr_index + 1); self.drop_ranges.add_control_edge(true_end, self.expr_index + 1);
} }
ExprKind::Assign(lhs, rhs, _) => {
self.visit_expr(lhs);
self.visit_expr(rhs);
reinit = Some(lhs);
}
ExprKind::Loop(body, ..) => {
let loop_begin = self.expr_index + 1;
self.visit_block(body);
self.drop_ranges.add_control_edge(self.expr_index, loop_begin);
}
ExprKind::Match(scrutinee, arms, ..) => { ExprKind::Match(scrutinee, arms, ..) => {
self.visit_expr(scrutinee); self.visit_expr(scrutinee);
@ -160,12 +155,45 @@ impl<'tcx> Visitor<'tcx> for DropRangeVisitor<'tcx> {
self.drop_ranges.add_control_edge(arm_end, self.expr_index + 1) self.drop_ranges.add_control_edge(arm_end, self.expr_index + 1)
}); });
} }
ExprKind::Loop(body, ..) => {
let loop_begin = self.expr_index + 1;
self.visit_block(body);
self.drop_ranges.add_control_edge(self.expr_index, loop_begin);
}
ExprKind::Break(hir::Destination { target_id: Ok(target), .. }, ..) ExprKind::Break(hir::Destination { target_id: Ok(target), .. }, ..)
| ExprKind::Continue(hir::Destination { target_id: Ok(target), .. }, ..) => { | ExprKind::Continue(hir::Destination { target_id: Ok(target), .. }, ..) => {
self.drop_ranges.add_control_edge_hir_id(self.expr_index, target); self.drop_ranges.add_control_edge_hir_id(self.expr_index, target);
} }
_ => intravisit::walk_expr(self, expr), ExprKind::AddrOf(..)
| ExprKind::Array(..)
| ExprKind::AssignOp(..)
| ExprKind::Binary(..)
| ExprKind::Block(..)
| ExprKind::Box(..)
| ExprKind::Break(..)
| ExprKind::Call(..)
| ExprKind::Cast(..)
| ExprKind::Closure(..)
| ExprKind::ConstBlock(..)
| ExprKind::Continue(..)
| ExprKind::DropTemps(..)
| ExprKind::Err
| ExprKind::Field(..)
| ExprKind::Index(..)
| ExprKind::InlineAsm(..)
| ExprKind::Let(..)
| ExprKind::Lit(..)
| ExprKind::LlvmInlineAsm(..)
| ExprKind::MethodCall(..)
| ExprKind::Path(..)
| ExprKind::Repeat(..)
| ExprKind::Ret(..)
| ExprKind::Struct(..)
| ExprKind::Tup(..)
| ExprKind::Type(..)
| ExprKind::Unary(..)
| ExprKind::Yield(..) => intravisit::walk_expr(self, expr),
} }
self.expr_index = self.expr_index + 1; self.expr_index = self.expr_index + 1;