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

Fix errors

Browse source
This commit is contained in:
John Kåre Alsaker 2017-08-12 07:37:17 +02:00
parent d020ff0c68
commit 1787d4ecf5
2 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_mir/build/scope.rs
View file

@ -433,7 +433,6 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
self.diverge_cleanup_gen(true);
let src_info = self.scopes[0].source_info(self.fn_span);
let tmp = self.get_unit_temp();
let mut block = self.cfg.start_new_block();
let result = block;
let mut rest = &mut self.scopes[..];
@ -463,13 +462,6 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
// End all regions for scopes out of which we are breaking.
self.cfg.push_end_region(block, src_info, scope.extent);
if let Some(ref free_data) = scope.free {
let next = self.cfg.start_new_block();
let free = build_free(self.hir.tcx(), &tmp, free_data, next);
self.cfg.terminate(block, scope.source_info(free_data.span), free);
block = next;
}
}
self.cfg.terminate(block, src_info, TerminatorKind::GeneratorDrop);

2
src/librustc_mir/transform/generator.rs
View file

@ -576,7 +576,7 @@ fn creator_generator_resume_function<'a, 'tcx>(
make_generator_state_argument_indirect(tcx, def_id, mir);
no_landing_pads(tcx, &mut mir);
no_landing_pads(tcx, mir);
// Make sure we remove dead blocks to remove
// unrelated code from the drop part of the function