From 3d5a777fe19ab210aedf473678687a98023ff586 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 4 Aug 2011 18:23:58 -0700 Subject: [PATCH] rustc: Don't emit memset for non-structural types --- src/comp/middle/trans.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 7e913c528396..8e270bb78a9c 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -2349,7 +2349,12 @@ fn drop_slot(cx: &@block_ctxt, slot: ValueRef, t: &ty::t) -> result { let re = drop_ty(cx, llptr, t); let llty = val_ty(slot); let llelemty = lib::llvm::llvm::LLVMGetElementType(llty); - call_bzero(cx, slot, llsize_of(llelemty), C_uint(1u)); + if ty::type_is_structural(bcx_tcx(cx), t) { + 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; } @@ -5855,7 +5860,13 @@ fn zero_alloca(cx: &@block_ctxt, llptr: ValueRef, t: ty::t) -> result { bcx = call_bzero(llalign.bcx, llptr, llsz.val, llalign.val).bcx; } else { let llty = type_of(bcx_ccx(bcx), cx.sp, t); - bcx = call_bzero(cx, llptr, llsize_of(llty), C_uint(1u)).bcx; + if ty::type_is_structural(bcx_tcx(cx), t) { + 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); }