bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Use correct drop scopes for if expressions

Browse source
This commit is contained in:
Matthew Jasper 2021-02-25 22:37:22 +00:00 • committed by Caio
parent c0490a2dbb
commit 2d9f2eae84
3 changed files with 75 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_ast_lowering/src/expr.rs
View file

@ -443,9 +443,20 @@ impl<'hir> LoweringContext<'_, 'hir> {
else_opt: Option<&Expr>,
) -> hir::ExprKind<'hir> {
let cond = self.lower_expr(cond);
let then = self.arena.alloc(self.lower_block_expr(then));
let els = else_opt.map(|els| self.lower_expr(els));
hir::ExprKind::If(cond, then, els)
let wrapped_cond = match cond.kind {
hir::ExprKind::Let(..) => cond,
_ => self.expr_drop_temps(cond.span, cond, AttrVec::new()),
};
let then_expr = self.lower_block_expr(then);
if let Some(rslt) = else_opt {
hir::ExprKind::If(
wrapped_cond,
self.arena.alloc(then_expr),
Some(self.lower_expr(rslt)),
)
} else {
hir::ExprKind::If(wrapped_cond, self.arena.alloc(then_expr), None)
}
}
fn lower_expr_if_let(