From 526e73d7f882bf9a88fe957661cc2e09291cef5b Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Wed, 8 Feb 2012 09:14:30 -0800 Subject: make shape code use the tydesc found in the box, not the shape str --- src/rt/rust_shape.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/rt/rust_shape.cpp') 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; @@ -309,6 +309,15 @@ public: ptr_pair::make(in_data_0, in_data_1)), 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(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, -- cgit 1.4.1-3-g733a5