bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

[WIP] Eagerly construct bodies of THIR

Browse source
This commit is contained in:
LeSeulArtichaut 2021-02-24 21:29:09 +01:00
parent 3a5d45f68c
commit 60def4de5e
18 changed files with 1379 additions and 1618 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir_build/src/build/mod.rs
View file

@ -667,8 +667,8 @@ fn construct_const<'a, 'tcx>(
let mut block = START_BLOCK;
let ast_expr = &tcx.hir().body(body_id).value;
let expr = builder.hir.mirror(ast_expr);
unpack!(block = builder.into_expr(Place::return_place(), block, expr));
let expr = builder.hir.mirror_expr(ast_expr);
unpack!(block = builder.expr_into_dest(Place::return_place(), block, &expr));
let source_info = builder.source_info(span);
builder.cfg.terminate(block, source_info, TerminatorKind::Return);
@ -953,8 +953,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
self.source_scope = source_scope;
}
let body = self.hir.mirror(ast_body);
self.into(Place::return_place(), block, body)
let body = self.hir.mirror_expr(ast_body);
self.expr_into_dest(Place::return_place(), block, &body)
}
fn set_correct_source_scope_for_arg(
@ -1001,7 +1001,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
mod block;
mod cfg;
mod expr;
mod into;
mod matches;
mod misc;
mod scope;