---

yaml
---
r: 5051
b: refs/heads/master
c: c6a47e4
h: refs/heads/master
i:
  5049: aea1f72
  5047: fe89400
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d8bb3ce29aa22297a0bdcb9b2ef41fc60bf098e
+refs/heads/master: c6a47e4087c226bf61964fe1105b47328553a8aa

trunk/src/comp/middle/gc.rs

@@ -56,7 +56,10 @@ fn add_gc_root(cx: &@block_ctxt, llval: ValueRef, ty: ty::t) -> @block_ctxt {
       tk_derived. {
         // It's a derived type descriptor. First, spill it.
         let lltydescptr = trans::alloca(bcx, val_ty(lltydesc));
-        bld::Store(bcx, lltydesc, lltydescptr);
+
+        let llderivedtydescs =
+            trans::llderivedtydescs_block_ctxt(bcx_fcx(bcx));
+        bld::Store(llderivedtydescs, lltydesc, lltydescptr);
 
         let number = gc_cx.next_tydesc_num;
         gc_cx.next_tydesc_num += 1u;
@@ -71,10 +74,10 @@ fn add_gc_root(cx: &@block_ctxt, llval: ValueRef, ty: ty::t) -> @block_ctxt {
         lldestindex = lll::LLVMConstPointerCast(lldestindex, T_ptr(T_i8()));
         llsrcindex = lll::LLVMConstPointerCast(llsrcindex, T_ptr(T_i8()));
 
-        lltydescptr =
-            bld::PointerCast(bcx, lltydescptr, T_ptr(T_ptr(T_i8())));
+        lltydescptr = bld::PointerCast(llderivedtydescs, lltydescptr,
+                                       T_ptr(T_ptr(T_i8())));
 
-        bld::Call(bcx, gcroot, [lltydescptr, lldestindex]);
+        bld::Call(llderivedtydescs, gcroot, [lltydescptr, lldestindex]);
         bld::Call(bcx, gcroot, [llvalptr, llsrcindex]);
       }
       tk_param. {