---

yaml
---
r: 4925
b: refs/heads/master
c: 72d78e6
h: refs/heads/master
i:
  4923: 15101eb
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dc1d7ee57bed7f0bd54e0369633fc09e200bbd6
+refs/heads/master: 72d78e6a93829703f64bd59f502410bebe64ae91

trunk/src/rt/rust_gc.cpp

@@ -119,8 +119,8 @@ gc::mark(std::vector<root> &roots) {
         DPRINT("root: %p\n", ri->data);
 
         shape::arena arena;
-        shape::type_param *params = shape::type_param::make(ri->tydesc,
-                                                            arena);
+        shape::type_param *params = shape::type_param::from_tydesc(ri->tydesc,
+                                                                   arena);
         shape::log log(task, ri->tydesc->shape, params,
                        ri->tydesc->shape_tables, ri->data, std::cerr);
         log.walk(true);

trunk/src/rt/rust_shape.cpp

@@ -17,23 +17,37 @@ namespace shape {
 
 using namespace shape;
 
-// Forward declarations
-
-struct rust_obj;
-struct size_align;
-struct type_param;
-
-
 // Constants
 
 const uint8_t CMP_EQ = 0u;
 const uint8_t CMP_LT = 1u;
 const uint8_t CMP_LE = 2u;
 
-}   // end namespace shape
 
+// Type parameters
+
+type_param *
+type_param::make(const type_desc **tydescs, unsigned n_tydescs,
+                 arena &arena) {
+    if (!n_tydescs)
+        return NULL;
+
+    type_param *ptrs = arena.alloc<type_param>(n_tydescs);
+    for (uint32_t i = 0; i < n_tydescs; i++) {
+        const type_desc *subtydesc = tydescs[i];
+        ptrs[i].shape = subtydesc->shape;
+        ptrs[i].tables = subtydesc->shape_tables;
+        ptrs[i].params = from_tydesc(subtydesc, arena);
+    }
+    return ptrs;
+}
+
+type_param *
+type_param::from_obj_shape(const uint8_t *sp, arena &arena) {
+    // TODO
+    abort();
+}
 
-namespace shape {
 
 // A shape printer, useful for debugging
 
@@ -469,7 +483,7 @@ upcall_cmp_type(int8_t *result, rust_task *task, type_desc *tydesc,
                 const type_desc **subtydescs, uint8_t *data_0,
                 uint8_t *data_1, uint8_t cmp_type) {
     shape::arena arena;
-    shape::type_param *params = shape::type_param::make(tydesc, arena);
+    shape::type_param *params = shape::type_param::from_tydesc(tydesc, arena);
     shape::cmp cmp(task, tydesc->shape, params, tydesc->shape_tables, data_0,
                    data_1);
     cmp.walk(true);
@@ -488,7 +502,7 @@ upcall_log_type(rust_task *task, type_desc *tydesc, uint8_t *data,
         return;     // TODO: Don't evaluate at all?
 
     shape::arena arena;
-    shape::type_param *params = shape::type_param::make(tydesc, arena);
+    shape::type_param *params = shape::type_param::from_tydesc(tydesc, arena);
 
     std::stringstream ss;
     shape::log log(task, tydesc->shape, params, tydesc->shape_tables, data,

trunk/src/rt/rust_shape.h

@@ -51,7 +51,7 @@ const uint8_t SHAPE_VAR = 21u;
 
 struct rust_obj;
 struct size_align;
-struct type_param;
+class type_param;
 
 
 // Arenas; these functions must execute very quickly, so we use an arena
@@ -215,10 +215,18 @@ struct rust_obj {
 
 // Type parameters
 
-struct type_param {
+class type_param {
+private:
+    static type_param *make(const type_desc **tydescs, unsigned n_tydescs,
+                            arena &arena);
+
+public:
     const uint8_t *shape;
     const rust_shape_tables *tables;
-    const struct type_param *params;    // subparameters
+    const type_param *params;   // subparameters
+
+    // Creates type parameters from an object shape description.
+    static type_param *from_obj_shape(const uint8_t *sp, arena &arena);
 
     template<typename T>
     inline void set(ctxt<T> *cx) {
@@ -227,19 +235,10 @@ struct type_param {
         params = cx->params;
     }
 
-    static type_param *make(const type_desc *tydesc, arena &arena) {
-        uint32_t n_params = tydesc->n_params;
-        if (!n_params)
-            return NULL;
-
-        type_param *ptrs = arena.alloc<type_param>(n_params);
-        for (uint32_t i = 0; i < n_params; i++) {
-            const type_desc *subtydesc = tydesc->first_param[i];
-            ptrs[i].shape = subtydesc->shape;
-            ptrs[i].tables = subtydesc->shape_tables;
-            ptrs[i].params = make(subtydesc, arena);
-        }
-        return ptrs;
+    // Creates type parameters from a type descriptor.
+    static inline type_param *from_tydesc(const type_desc *tydesc,
+                                          arena &arena) {
+        return make(tydesc->first_param, tydesc->n_params, arena);
     }
 };
 
@@ -483,6 +482,7 @@ class print : public ctxt<print> {
     }
 };
 
+
 //
 // Size-of (which also computes alignment). Be warned: this is an expensive
 // operation.
@@ -892,12 +892,17 @@ data<T,U>::walk_obj_contents(bool align, ptr &dp) {
     uint8_t *box_ptr = bump_dp<uint8_t *>(dp);
     type_desc *subtydesc =
         *reinterpret_cast<type_desc **>(box_ptr + sizeof(void *));
-    ptr obj_closure_dp(box_ptr + sizeof(void *));
+    ptr obj_closure_dp(*box_ptr + sizeof(void *));
 
+    // FIXME: Should be type_param::from_obj_shape() below.
     arena arena;
-    type_param *params = type_param::make(subtydesc, arena);
+    type_param *params = type_param::from_tydesc(subtydesc, arena);
     T sub(*static_cast<T *>(this), subtydesc->shape, params,
           subtydesc->shape_tables, obj_closure_dp);
+
+    print print(sub);
+    print.walk(false);
+
     sub.walk(true);
 }