From 0c4e0fdfae2fad4a132bdfef3cb856ec5dde84c9 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 23 Sep 2011 16:51:50 -0700
Subject: rt: Get rid of the hack that looks for captured type descriptors
 adjacent to the root one for functions and objects

---
 src/rt/rust_gc.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/rt/rust_gc.cpp')

diff --git a/src/rt/rust_gc.cpp b/src/rt/rust_gc.cpp
index ae3c5a01031..26e48857ecb 100644
--- a/src/rt/rust_gc.cpp
+++ b/src/rt/rust_gc.cpp
@@ -105,7 +105,8 @@ gc::mark(std::vector<root> &roots) {
 
         shape::arena arena;
         shape::type_param *params =
-            shape::type_param::from_tydesc(&ri->tydesc, arena);
+            shape::type_param::from_tydesc_and_data(ri->tydesc, ri->data,
+                                                    arena);
         shape::log log(task, true, ri->tydesc->shape, params,
                        ri->tydesc->shape_tables, ri->data, std::cerr);
         log.walk();
-- 
cgit 1.4.1-3-g733a5