Skip to content

Commit 0b4e5ee

Browse files
committed
---
yaml --- r: 4834 b: refs/heads/master c: f6ae60a h: refs/heads/master v: v3
1 parent 84d7e48 commit 0b4e5ee

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 0ba10378340f0d975c7aa88ad258b4367b3d35c3
2+
refs/heads/master: f6ae60a432d041b4387f9655dc7e8551b8cbed00

trunk/src/comp/middle/trans.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5438,8 +5438,9 @@ fn zero_alloca(cx: &@block_ctxt, llptr: ValueRef, t: ty::t) -> result {
54385438
let bcx = cx;
54395439
if ty::type_has_dynamic_size(bcx_tcx(cx), t) {
54405440
let llsz = size_of(bcx, t);
5441-
let llalign = align_of(llsz.bcx, t);
5442-
bcx = call_bzero(llalign.bcx, llptr, llsz.val, llalign.val).bcx;
5441+
// FIXME passing in the align here is correct, but causes issue #843
5442+
// let llalign = align_of(llsz.bcx, t);
5443+
bcx = call_bzero(llsz.bcx, llptr, llsz.val, C_int(0)).bcx;
54435444
} else {
54445445
let llty = type_of(bcx_ccx(bcx), cx.sp, t);
54455446
bcx.build.Store(C_null(llty), llptr);

0 commit comments

Comments
 (0)