Skip to content

Commit 30cc3b3

Browse files
committed
---
yaml --- r: 232641 b: refs/heads/try c: 568b13e h: refs/heads/master i: 232639: 935e43a v: v3
1 parent 895e536 commit 30cc3b3

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: fd2663648f32bbada62a0542ecb4ec1c15885713
4+
refs/heads/try: 568b13e26cef2e65660508ed7062830b5ee9aa88
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_trans/trans/base.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -956,6 +956,11 @@ pub fn memcpy_ty<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
956956
t: Ty<'tcx>) {
957957
let _icx = push_ctxt("memcpy_ty");
958958
let ccx = bcx.ccx();
959+
960+
if type_is_zero_size(ccx, t) {
961+
return;
962+
}
963+
959964
if t.is_structural() {
960965
let llty = type_of::type_of(ccx, t);
961966
let llsz = llsize_of(ccx, llty);

0 commit comments

Comments
 (0)