dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rustc: Fix an LLVM assertion that tripped when borrowing a by-val method receiver. 

In certain lvalue code paths, the type of the borrowed value was not
being used to generate temporary spills. I'm a bit surprised we didn't
hit this sooner.
This commit is contained in:
Patrick Walton 2012-09-03 15:56:57 -07:00
parent e767011b77
commit 5573ad723f
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rustc/middle/trans/base.rs
View File

@ -3112,24 +3112,24 @@ fn trans_arg_expr(cx: block, arg: ty::arg, lldestty: TypeRef, e: @ast::expr,
ast::by_copy | ast::by_move => {
// Ensure that an owned copy of the value is in memory:
let alloc = alloc_ty(bcx, arg.ty);
let alloc = alloc_ty(bcx, e_ty);
let move_out = arg_mode == ast::by_move ||
ccx.maps.last_use_map.contains_key(e.id);
if lv.kind == lv_temporary { revoke_clean(bcx, val); }
if lv.kind == lv_owned || !ty::type_is_immediate(arg.ty) {
memmove_ty(bcx, alloc, val, arg.ty);
if move_out && ty::type_needs_drop(ccx.tcx, arg.ty) {
bcx = zero_mem(bcx, val, arg.ty);
if lv.kind == lv_owned || !ty::type_is_immediate(e_ty) {
memmove_ty(bcx, alloc, val, e_ty);
if move_out && ty::type_needs_drop(ccx.tcx, e_ty) {
bcx = zero_mem(bcx, val, e_ty);
}
} else { Store(bcx, val, alloc); }
val = alloc;
if lv.kind != lv_temporary && !move_out {
bcx = take_ty(bcx, val, arg.ty);
bcx = take_ty(bcx, val, e_ty);
}
// In the event that failure occurs before the call actually
// happens, have to cleanup this copy:
add_clean_temp_mem(bcx, val, arg.ty);
add_clean_temp_mem(bcx, val, e_ty);
vec::push(temp_cleanups, val);
}
}

13
src/test/run-pass/borrow-by-val-method-receiver.rs Normal file
View File

@ -0,0 +1,13 @@
trait Foo {
fn foo(self);
}
impl &[int]: Foo {
fn foo(self) {}
}
fn main() {
let items = ~[ 3, 5, 1, 2, 4 ];
items.foo();
}