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

Fix new usage of old api

Browse source
This commit is contained in:
Gary Guo 2023-03-06 16:36:42 +00:00
parent e29b5badbc
commit c5829c2ee5
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_mir_build/src/build/custom/parse/instruction.rs
View file

@ -56,7 +56,7 @@ impl<'tcx, 'body> ParseCtxt<'tcx, 'body> {
Ok(TerminatorKind::Drop { Ok(TerminatorKind::Drop {
place: self.parse_place(args[0])?, place: self.parse_place(args[0])?,
target: self.parse_block(args[1])?, target: self.parse_block(args[1])?,
unwind: None, unwind: UnwindAction::Continue,
}) })
}, },
@call("mir_call", args) => { @call("mir_call", args) => {
@ -126,7 +126,7 @@ impl<'tcx, 'body> ParseCtxt<'tcx, 'body> {
args, args,
destination, destination,
target: Some(target), target: Some(target),
cleanup: None, unwind: UnwindAction::Continue,
from_hir_call: *from_hir_call, from_hir_call: *from_hir_call,
fn_span: *fn_span, fn_span: *fn_span,
}) })

4
compiler/rustc_mir_build/src/build/scope.rs
View file

@ -1438,11 +1438,11 @@ impl<'tcx> DropTreeBuilder<'tcx> for Unwind {
let term = &mut cfg.block_data_mut(from).terminator_mut(); let term = &mut cfg.block_data_mut(from).terminator_mut();
match &mut term.kind { match &mut term.kind {
TerminatorKind::Drop { unwind, .. } => { TerminatorKind::Drop { unwind, .. } => {
if let Some(unwind) = *unwind { if let UnwindAction::Cleanup(unwind) = *unwind {
let source_info = term.source_info; let source_info = term.source_info;
cfg.terminate(unwind, source_info, TerminatorKind::Goto { target: to }); cfg.terminate(unwind, source_info, TerminatorKind::Goto { target: to });
} else { } else {
*unwind = Some(to); *unwind = UnwindAction::Cleanup(to);
} }
} }
TerminatorKind::FalseUnwind { unwind, .. } TerminatorKind::FalseUnwind { unwind, .. }

2
compiler/rustc_mir_transform/src/elaborate_drops.rs
View file

@ -160,7 +160,7 @@ fn remove_dead_unwinds<'tcx>(
let basic_blocks = body.basic_blocks.as_mut(); let basic_blocks = body.basic_blocks.as_mut();
for &bb in dead_unwinds.iter() { for &bb in dead_unwinds.iter() {
if let Some(unwind) = basic_blocks[bb].terminator_mut().unwind_mut() { if let Some(unwind) = basic_blocks[bb].terminator_mut().unwind_mut() {
*unwind = None; *unwind = UnwindAction::Unreachable;
} }
} }
} }