about summary refs log tree commit diff
path: root/src/rt/rust_upcall.cpp
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2011-08-24 18:36:51 -0700
committerPatrick Walton <pcwalton@mimiga.net>2011-08-25 12:01:10 -0700
commit880fd788eb04717d7a75bd5bbf0b8f0a692bda53 (patch)
tree2d57e4c0d96cfc996fff4f70186c4e267c6733e6 /src/rt/rust_upcall.cpp
parent2f7c583bc12c0bddb28e43ea79b593a014811b09 (diff)
downloadrust-880fd788eb04717d7a75bd5bbf0b8f0a692bda53.tar.gz
rust-880fd788eb04717d7a75bd5bbf0b8f0a692bda53.zip
rustc: Add an extra flag to object tydescs so that shapes know how to find the captured subtydescs
Diffstat (limited to 'src/rt/rust_upcall.cpp')
-rw-r--r--src/rt/rust_upcall.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 174855cac23..9857f06231e 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -339,7 +339,8 @@ upcall_get_type_desc(rust_task *task,
                      size_t size,
                      size_t align,
                      size_t n_descs,
-                     type_desc const **descs) {
+                     type_desc const **descs,
+                     uintptr_t n_obj_params) {
     check_stack(task);
     LOG_UPCALL_ENTRY(task);
 
@@ -347,7 +348,8 @@ upcall_get_type_desc(rust_task *task,
         ", align=%" PRIdPTR ", %" PRIdPTR " descs", size, align,
         n_descs);
     rust_crate_cache *cache = task->get_crate_cache();
-    type_desc *td = cache->get_type_desc(size, align, n_descs, descs);
+    type_desc *td = cache->get_type_desc(size, align, n_descs, descs,
+                                         n_obj_params);
     LOG(task, cache, "returning tydesc 0x%" PRIxPTR, td);
     return td;
 }