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

Make make_clone_call take a Place argument

Browse Source
This commit is contained in:
Manish Goregaokar 2018-01-30 10:38:54 +05:30
parent def3269a71
commit e07aecde48
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/librustc_mir/shim.rs
View File

@ -407,8 +407,9 @@ impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> {
ty: Ty<'tcx>, ty: Ty<'tcx>,
rcvr_field: Place<'tcx>, rcvr_field: Place<'tcx>,
next: BasicBlock, next: BasicBlock,
cleanup: BasicBlock cleanup: BasicBlock,
) -> Place<'tcx> { place: Place<'tcx>
) {
let tcx = self.tcx; let tcx = self.tcx;
let substs = Substs::for_item( let substs = Substs::for_item(
@ -439,8 +440,6 @@ impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> {
}) })
); );
let loc = self.make_place(Mutability::Not, ty);
// `let ref_loc: &ty = &rcvr_field;` // `let ref_loc: &ty = &rcvr_field;`
let statement = self.make_statement( let statement = self.make_statement(
StatementKind::Assign( StatementKind::Assign(
@ -453,11 +452,9 @@ impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> {
self.block(vec![statement], TerminatorKind::Call { self.block(vec![statement], TerminatorKind::Call {
func, func,
args: vec![Operand::Move(ref_loc)], args: vec![Operand::Move(ref_loc)],
destination: Some((loc.clone(), next)), destination: Some((place, next)),
cleanup: Some(cleanup), cleanup: Some(cleanup),
}, false); }, false);
loc
} }
fn loop_header( fn loop_header(
@ -540,7 +537,9 @@ impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> {
// `let cloned = Clone::clone(rcvr[beg])`; // `let cloned = Clone::clone(rcvr[beg])`;
// Goto #3 if ok, #5 if unwinding happens. // Goto #3 if ok, #5 if unwinding happens.
let rcvr_field = rcvr.clone().index(beg); let rcvr_field = rcvr.clone().index(beg);
let cloned = self.make_clone_call(ty, rcvr_field, BasicBlock::new(3), BasicBlock::new(5)); let cloned = self.make_place(Mutability::Not, ty);
self.make_clone_call(ty, rcvr_field, BasicBlock::new(3),
BasicBlock::new(5), cloned.clone());
// BB #3 // BB #3
// `ret[beg] = cloned;` // `ret[beg] = cloned;`
@ -638,16 +637,18 @@ impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> {
for (i, ity) in tys.iter().enumerate() { for (i, ity) in tys.iter().enumerate() {
let rcvr_field = rcvr.clone().field(Field::new(i), *ity); let rcvr_field = rcvr.clone().field(Field::new(i), *ity);
let place = self.make_place(Mutability::Not, ity);
returns.push(place.clone());
// BB #(2i) // BB #(2i)
// `returns[i] = Clone::clone(&rcvr.i);` // `returns[i] = Clone::clone(&rcvr.i);`
// Goto #(2i + 2) if ok, #(2i + 1) if unwinding happens. // Goto #(2i + 2) if ok, #(2i + 1) if unwinding happens.
returns.push( self.make_clone_call(
self.make_clone_call( *ity,
*ity, rcvr_field,
rcvr_field, BasicBlock::new(2 * i + 2),
BasicBlock::new(2 * i + 2), BasicBlock::new(2 * i + 1),
BasicBlock::new(2 * i + 1), place
)
); );
// BB #(2i + 1) (cleanup) // BB #(2i + 1) (cleanup)