squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Revert "rustc: Don't emit memset for non-structural types" due to crashes

Browse source 
This reverts commit 3d5a777fe1.
This commit is contained in:
Patrick Walton 2011-08-04 19:06:13 -07:00
parent 3d5a777fe1
commit a26c027731
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/comp/middle/trans.rs
View file

@ -2349,12 +2349,7 @@ fn drop_slot(cx: &@block_ctxt, slot: ValueRef, t: &ty::t) -> result {
let re = drop_ty(cx, llptr, t); let re = drop_ty(cx, llptr, t);
let llty = val_ty(slot); let llty = val_ty(slot);
let llelemty = lib::llvm::llvm::LLVMGetElementType(llty); let llelemty = lib::llvm::llvm::LLVMGetElementType(llty);
if ty::type_is_structural(bcx_tcx(cx), t) { call_bzero(cx, slot, llsize_of(llelemty), C_uint(1u));
call_bzero(cx, slot, C_uint(llsize_of_real(bcx_ccx(cx), llelemty)),
C_uint(llalign_of_real(bcx_ccx(cx), llelemty)));
} else {
cx.build.Store(C_null(llelemty), slot);
}
ret re; ret re;
} }
@ -5860,13 +5855,7 @@ fn zero_alloca(cx: &@block_ctxt, llptr: ValueRef, t: ty::t) -> result {
bcx = call_bzero(llalign.bcx, llptr, llsz.val, llalign.val).bcx; bcx = call_bzero(llalign.bcx, llptr, llsz.val, llalign.val).bcx;
} else { } else {
let llty = type_of(bcx_ccx(bcx), cx.sp, t); let llty = type_of(bcx_ccx(bcx), cx.sp, t);
if ty::type_is_structural(bcx_tcx(cx), t) { bcx = call_bzero(cx, llptr, llsize_of(llty), C_uint(1u)).bcx;
bcx = call_bzero(cx, llptr,
C_uint(llsize_of_real(bcx_ccx(cx), llty)),
C_uint(llalign_of_real(bcx_ccx(cx), llty))).bcx;
} else {
bcx.build.Store(C_null(llty), llptr);
}
} }
ret rslt(bcx, llptr); ret rslt(bcx, llptr);
} }