OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cases of conflicting two-phase borrows

Browse Source
This commit is contained in:
Matthew Jasper 2019-02-27 20:32:12 +00:00
parent 2d065712cf
commit 7eda723279
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc_codegen_llvm/abi.rs
View File

@ -266,7 +266,8 @@ impl ArgTypeExt<'ll, 'tcx> for ArgType<'tcx, Ty<'tcx>> {
OperandValue::Ref(next(), Some(next()), self.layout.align.abi).store(bx, dst);
}
PassMode::Direct(_) | PassMode::Indirect(_, None) | PassMode::Cast(_) => {
self.store(bx, next(), dst);
let next_arg = next();
self.store(bx, next_arg, dst);
}
}
}

6
src/librustc_mir/transform/add_retag.rs
View File

@ -164,7 +164,7 @@ impl MirPass for AddRetag {
if src_ty.is_region_ptr() {
// The only `Misc` casts on references are those creating raw pointers.
assert!(dest_ty.is_unsafe_ptr());
(RetagKind::Raw, place)
(RetagKind::Raw, place.clone())
} else {
// Some other cast, no retag
continue
@ -182,7 +182,7 @@ impl MirPass for AddRetag {
_ =>
RetagKind::Default,
};
(kind, place)
(kind, place.clone())
}
// Do nothing for the rest
_ => continue,
@ -191,7 +191,7 @@ impl MirPass for AddRetag {
let source_info = block_data.statements[i].source_info;
block_data.statements.insert(i+1, Statement {
source_info,
kind: StatementKind::Retag(retag_kind, place.clone()),
kind: StatementKind::Retag(retag_kind, place),
});
}
}

4
src/libsyntax_ext/format.rs
View File

@ -347,9 +347,9 @@ impl<'a, 'b> Context<'a, 'b> {
Named(name) => {
match self.names.get(&name) {
Some(idx) => {
Some(&idx) => {
// Treat as positional arg.
self.verify_arg_type(Exact(*idx), ty)
self.verify_arg_type(Exact(idx), ty)
}
None => {
let msg = format!("there is no argument named `{}`", name);