about summary refs log tree commit diff
path: root/src/rt/rust_shape.cpp
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2012-02-08 09:14:30 -0800
committerNiko Matsakis <niko@alum.mit.edu>2012-02-08 09:14:59 -0800
commit526e73d7f882bf9a88fe957661cc2e09291cef5b (patch)
tree78c551a1d0c7d0bbd5d337eb606cc1f570ecc6d1 /src/rt/rust_shape.cpp
parent3a1e33e134cf3adc8a1844b59f57828478b36aff (diff)
downloadrust-526e73d7f882bf9a88fe957661cc2e09291cef5b.tar.gz
rust-526e73d7f882bf9a88fe957661cc2e09291cef5b.zip
make shape code use the tydesc found in the box, not the shape str
Diffstat (limited to 'src/rt/rust_shape.cpp')
-rw-r--r--src/rt/rust_shape.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/rt/rust_shape.cpp b/src/rt/rust_shape.cpp
index 20f8bef89aa..866bc4ac17a 100644
--- a/src/rt/rust_shape.cpp
+++ b/src/rt/rust_shape.cpp
@@ -264,7 +264,7 @@ private:
         result = sub.result;
     }
 
-    inline void walk_box_contents2(cmp &sub, ptr_pair &box_dp) {
+    inline void walk_box_contents2(cmp &sub) {
         sub.align = true;
         sub.walk();
         result = sub.result;
@@ -310,6 +310,15 @@ public:
       result(0) {}
 
     cmp(const cmp &other,
+        const uint8_t *in_sp,
+        const type_param *in_params,
+        const rust_shape_tables *in_tables,
+        ptr_pair &in_dp)
+    : data<cmp,ptr_pair>(other.task, other.align, in_sp, in_params, in_tables,
+                         in_dp),
+      result(0) {}
+
+    cmp(const cmp &other,
         const uint8_t *in_sp = NULL,
         const type_param *in_params = NULL,
         const rust_shape_tables *in_tables = NULL)