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

Optimize clone shim for Copy types

Browse Source
This commit is contained in:
scalexm 2017-08-07 17:14:20 +02:00
parent 4e4e55aa77
commit df7be435d3
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/librustc_mir/shim.rs
View File

@ -347,7 +347,20 @@ fn build_clone_shim<'a, 'tcx>(tcx: ty::TyCtxt<'a, 'tcx, 'tcx>,
loc
};
let is_copy = !self_ty.moves_by_default(tcx, tcx.param_env(def_id), span);
match self_ty.sty {
_ if is_copy => {
// `return *self;`
let statement = Statement {
source_info: source_info,
kind: StatementKind::Assign(
Lvalue::Local(RETURN_POINTER),
Rvalue::Use(Operand::Consume(rcvr))
)
};
block(&mut blocks, statement, TerminatorKind::Return);
}
ty::TyArray(ty, len) => {
let mut returns = Vec::new();
for i in 0..len {
@ -402,15 +415,7 @@ fn build_clone_shim<'a, 'tcx>(tcx: ty::TyCtxt<'a, 'tcx, 'tcx>,
block(&mut blocks, statement, TerminatorKind::Return);
}
_ => {
// `return *self;`
let statement = Statement {
source_info: source_info,
kind: StatementKind::Assign(
Lvalue::Local(RETURN_POINTER),
Rvalue::Use(Operand::Consume(rcvr))
)
};
block(&mut blocks, statement, TerminatorKind::Return);
bug!("builtin shim for `{:?}` which is not `Copy` and is not an aggregate", self_ty);
}
};