about summary refs log tree commit diff
path: root/src/rt/rust_gc.cpp
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2011-09-23 16:51:50 -0700
committerPatrick Walton <pcwalton@mimiga.net>2011-09-23 17:57:25 -0700
commit0c4e0fdfae2fad4a132bdfef3cb856ec5dde84c9 (patch)
tree247c7e3e776df8ff964ebca50fb9321696542384 /src/rt/rust_gc.cpp
parent6164de90e2277aac21f85894acf79ed0561cd3ae (diff)
downloadrust-0c4e0fdfae2fad4a132bdfef3cb856ec5dde84c9.tar.gz
rust-0c4e0fdfae2fad4a132bdfef3cb856ec5dde84c9.zip
rt: Get rid of the hack that looks for captured type descriptors adjacent to the root one for functions and objects
Diffstat (limited to 'src/rt/rust_gc.cpp')
-rw-r--r--src/rt/rust_gc.cpp3
1 files changed, 2 insertions, 1 deletions
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();