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

add_validation: handle drop

Browse source
This commit is contained in:
Ralf Jung 2017-07-13 22:10:14 -07:00
parent 82786b2fe1
commit 24a2ac9e46
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustc_mir/transform/add_validation.rs
View file

@ -70,9 +70,19 @@ impl MirPass for AddValidation {
returns.push((source_info, destination.0.clone(), destination.1));
}
}
Some(Terminator { kind: TerminatorKind::Drop { location: ref lval, .. }, source_info }) |
Some(Terminator { kind: TerminatorKind::DropAndReplace { location: ref lval, .. }, source_info }) => {
// Before the call: Release all arguments
let ty = lval.ty(&local_decls, tcx).to_ty(tcx);
let release_stmt = Statement {
source_info,
kind: StatementKind::Validate(ValidationOp::Release, vec![(ty, lval.clone())])
};
block_data.statements.push(release_stmt);
// drop doesn't return anything, so we need no acquire.
}
_ => {
// Not a block ending in a Call -> ignore.
// TODO: Handle drop.
}
}
}
@ -108,7 +118,6 @@ impl MirPass for AddValidation {
block_data.statements.insert(i+1, acquire_stmt);
// The source is released until the region of the borrow ends.
// FIXME: We have to check whether the source path was writable.
let src_ty = src_lval.ty(&local_decls, tcx).to_ty(tcx);
let op = match re {
&RegionKind::ReScope(ce) => ValidationOp::Suspend(ce),