Skip to content

Commit defe6b2

Browse files
committed
---
yaml --- r: 33437 b: refs/heads/snap-stage3 c: 64e1ecb h: refs/heads/master i: 33435: 880dccc v: v3
1 parent 0b13fa9 commit defe6b2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
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: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 2eea07be1108a3705af136782370394c48744132
4+
refs/heads/snap-stage3: 64e1ecb939542d689358ef05963db214e4ea198d
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustc/middle/trans/base.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ fn malloc_raw_dyn(bcx: block, t: ty::t, heap: heap,
267267
fn non_gc_box_cast(bcx: block, val: ValueRef) -> ValueRef {
268268
debug!("non_gc_box_cast");
269269
add_comment(bcx, ~"non_gc_box_cast");
270-
assert(llvm::LLVMGetPointerAddressSpace(val_ty(val)) == gc_box_addrspace || bcx.unreachable);
270+
assert(llvm::LLVMGetPointerAddressSpace(val_ty(val)) == gc_box_addrspace
271+
|| bcx.unreachable);
271272
let non_gc_t = T_ptr(llvm::LLVMGetElementType(val_ty(val)));
272273
PointerCast(bcx, val, non_gc_t)
273274
}

0 commit comments

Comments
 (0)