@@ -15,6 +15,7 @@ import std::unsafe;
15
15
import std:: vec;
16
16
17
17
import lll = lib:: llvm:: llvm;
18
+ import bld = trans_build;
18
19
19
20
type ctxt = @{ mutable next_tydesc_num : uint } ;
20
21
@@ -47,13 +48,13 @@ fn add_gc_root(cx: &@block_ctxt, llval: ValueRef, ty: ty::t) -> @block_ctxt {
47
48
let lltydesc = td_r. result . val ;
48
49
49
50
let gcroot = bcx_ccx ( bcx) . intrinsics . get ( "llvm.gcroot" ) ;
50
- let llvalptr = bcx . build . PointerCast ( llval, T_ptr ( T_ptr ( T_i8 ( ) ) ) ) ;
51
+ let llvalptr = bld :: PointerCast ( bcx , llval, T_ptr ( T_ptr ( T_i8 ( ) ) ) ) ;
51
52
52
53
alt td_r. kind {
53
54
tk_derived. {
54
55
// It's a derived type descriptor. First, spill it.
55
56
let lltydescptr = trans:: alloca ( bcx, val_ty ( lltydesc) ) ;
56
- bcx . build . Store ( lltydesc, lltydescptr) ;
57
+ bld :: Store ( bcx , lltydesc, lltydescptr) ;
57
58
58
59
let number = gc_cx. next_tydesc_num ;
59
60
gc_cx. next_tydesc_num += 1 u;
@@ -69,10 +70,10 @@ fn add_gc_root(cx: &@block_ctxt, llval: ValueRef, ty: ty::t) -> @block_ctxt {
69
70
llsrcindex = lll:: LLVMConstPointerCast ( llsrcindex, T_ptr ( T_i8 ( ) ) ) ;
70
71
71
72
lltydescptr =
72
- bcx . build . PointerCast ( lltydescptr, T_ptr ( T_ptr ( T_i8 ( ) ) ) ) ;
73
+ bld :: PointerCast ( bcx , lltydescptr, T_ptr ( T_ptr ( T_i8 ( ) ) ) ) ;
73
74
74
- bcx . build . Call ( gcroot, [ lltydescptr, lldestindex] ) ;
75
- bcx . build . Call ( gcroot, [ llvalptr, llsrcindex] ) ;
75
+ bld :: Call ( bcx , gcroot, [ lltydescptr, lldestindex] ) ;
76
+ bld :: Call ( bcx , gcroot, [ llvalptr, llsrcindex] ) ;
76
77
}
77
78
tk_param. {
78
79
bcx_tcx ( cx) . sess . bug ( "we should never be trying to root values " +
@@ -87,7 +88,7 @@ fn add_gc_root(cx: &@block_ctxt, llval: ValueRef, ty: ty::t) -> @block_ctxt {
87
88
let llstaticgcmetaptr =
88
89
lll:: LLVMConstPointerCast ( llstaticgcmeta, T_ptr ( T_i8 ( ) ) ) ;
89
90
90
- bcx . build . Call ( gcroot, [ llvalptr, llstaticgcmetaptr] ) ;
91
+ bld :: Call ( bcx , gcroot, [ llvalptr, llstaticgcmetaptr] ) ;
91
92
}
92
93
}
93
94
0 commit comments