---

yaml
---
r: 15734
b: refs/heads/try
c: 11a5d10
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: e1fc7d5f0126e4c213cac589bf301814e0327b9e
+refs/heads/try: 11a5d10bf2958c642ae6a7c4afff8e181aa2167d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_box_annihilator.cpp

@@ -49,8 +49,16 @@ class annihilator : public shape::data<annihilator,shape::ptr> {
         task->kernel->free(vec);
     }
 
+    void walk_fixedvec2(uint16_t sz, bool is_pod) {
+        walk_vec2(is_pod, get_fixedvec_data_range(sz, dp));
+    }
+
     void walk_vec2(bool is_pod,
                   const std::pair<shape::ptr,shape::ptr> &data_range) {
+
+        if (is_pod)
+            return;
+
         annihilator sub(*this, data_range.first);
         shape::ptr data_end = sub.end_dp = data_range.second;
         while (sub.dp < data_end) {
@@ -64,6 +72,10 @@ class annihilator : public shape::data<annihilator,shape::ptr> {
           ::walk_variant1(tinfo, tag_variant);
     }
 
+    void walk_rptr2() { }
+
+    void walk_slice2(bool, bool) { }
+
     void walk_uniq2() {
         void *x = *((void **)dp);
         // free contents first:

branches/try/src/rt/rust_cc.cpp

@@ -73,19 +73,37 @@ class irc : public shape::data<irc,shape::ptr> {
                                   in_tables, in_data),
       ircs(in_ircs) {}
 
-    void walk_vec2(bool is_pod) {
-        if (is_pod || shape::get_dp<void *>(dp) == NULL)
-            return;     // There can't be any outbound pointers from this.
 
-        std::pair<uint8_t *,uint8_t *> data_range(get_vec_data_range(dp));
+    void walk_vec2(bool is_pod, std::pair<uint8_t *,uint8_t *> data_range) {
+
+        // There can't be any outbound pointers from pod.
+        if (is_pod)
+            return;
+
         irc sub(*this, data_range.first);
         shape::ptr data_end = sub.end_dp = data_range.second;
         while (sub.dp < data_end) {
             sub.walk_reset();
+            // FIXME: shouldn't this be 'sub.align = true;'?
             align = true;
         }
     }
 
+    void walk_vec2(bool is_pod) {
+        if (shape::get_dp<void *>(dp) == NULL)
+            return;
+
+        walk_vec2(is_pod, get_vec_data_range(dp));
+    }
+
+    void walk_slice2(bool is_pod, bool is_str) {
+        walk_vec2(is_pod, get_slice_data_range(is_str, dp));
+    }
+
+    void walk_fixedvec2(uint16_t sz, bool is_pod) {
+        walk_vec2(is_pod, get_fixedvec_data_range(sz, dp));
+    }
+
     void walk_tag2(shape::tag_info &tinfo, uint32_t tag_variant) {
         shape::data<irc,shape::ptr>::walk_variant1(tinfo, tag_variant);
     }
@@ -102,6 +120,10 @@ class irc : public shape::data<irc,shape::ptr> {
         shape::data<irc,shape::ptr>::walk_uniq_contents1();
     }
 
+    void walk_rptr2() {
+        shape::data<irc,shape::ptr>::walk_rptr_contents1();
+    }
+
     void walk_fn2(char code) {
         switch (code) {
           case shape::SHAPE_BOX_FN: {
@@ -137,6 +159,8 @@ class irc : public shape::data<irc,shape::ptr> {
 
     void walk_uniq_contents2(irc &sub) { sub.walk(); }
 
+    void walk_rptr_contents2(irc &sub) { sub.walk(); }
+
     void walk_box_contents2(irc &sub) {
         maybe_record_irc();
 
@@ -305,11 +329,12 @@ class mark : public shape::data<mark,shape::ptr> {
                                    in_tables, in_data),
       marked(in_marked) {}
 
-    void walk_vec2(bool is_pod) {
-        if (is_pod || shape::get_dp<void *>(dp) == NULL)
-            return;     // There can't be any outbound pointers from this.
+    void walk_vec2(bool is_pod, std::pair<uint8_t *,uint8_t *> data_range) {
+
+        // There can't be any outbound pointers from pod.
+        if (is_pod)
+            return;
 
-        std::pair<uint8_t *,uint8_t *> data_range(get_vec_data_range(dp));
         if (data_range.second - data_range.first > 100000)
             abort();    // FIXME: Temporary sanity check.
 
@@ -321,6 +346,20 @@ class mark : public shape::data<mark,shape::ptr> {
         }
     }
 
+    void walk_vec2(bool is_pod) {
+        if (shape::get_dp<void *>(dp) == NULL)
+            return;
+        walk_vec2(is_pod, get_vec_data_range(dp));
+    }
+
+    void walk_slice2(bool is_pod, bool is_str) {
+        walk_vec2(is_pod, get_slice_data_range(is_str, dp));
+    }
+
+    void walk_fixedvec2(uint16_t sz, bool is_pod) {
+        walk_vec2(is_pod, get_fixedvec_data_range(sz, dp));
+    }
+
     void walk_tag2(shape::tag_info &tinfo, uint32_t tag_variant) {
         shape::data<mark,shape::ptr>::walk_variant1(tinfo, tag_variant);
     }
@@ -337,6 +376,10 @@ class mark : public shape::data<mark,shape::ptr> {
         shape::data<mark,shape::ptr>::walk_uniq_contents1();
     }
 
+    void walk_rptr2() {
+        shape::data<mark,shape::ptr>::walk_rptr_contents1();
+    }
+
     void walk_fn2(char code) {
         switch (code) {
           case shape::SHAPE_BOX_FN: {
@@ -372,6 +415,8 @@ class mark : public shape::data<mark,shape::ptr> {
 
     void walk_uniq_contents2(mark &sub) { sub.walk(); }
 
+    void walk_rptr_contents2(mark &sub) { sub.walk(); }
+
     void walk_box_contents2(mark &sub) {
         rust_opaque_box *box_ptr = *(rust_opaque_box **) dp;
 

branches/try/src/rt/rust_shape.cpp

@@ -254,6 +254,9 @@ class cmp : public data<cmp,ptr_pair> {
     friend class data<cmp,ptr_pair>;
 
 private:
+    void walk_slice2(bool is_pod,
+                     const std::pair<ptr_pair,ptr_pair> &data_range);
+
     void walk_vec2(bool is_pod,
                    const std::pair<ptr_pair,ptr_pair> &data_range);
 
@@ -274,6 +277,12 @@ class cmp : public data<cmp,ptr_pair> {
         result = sub.result;
     }
 
+    inline void walk_rptr_contents2(cmp &sub) {
+        sub.align = true;
+        sub.walk();
+        result = sub.result;
+    }
+
     inline void cmp_two_pointers() {
         ALIGN_TO(rust_alignof<void *>());
         data_pair<uint8_t *> fst = bump_dp<uint8_t *>(dp);
@@ -341,6 +350,16 @@ class cmp : public data<cmp,ptr_pair> {
         walk_vec2(is_pod, get_vec_data_range(dp));
     }
 
+    void walk_slice2(bool is_pod, bool is_str) {
+        // Slices compare just like vecs.
+        walk_vec2(is_pod, get_slice_data_range(is_str, dp));
+    }
+
+    void walk_fixedvec2(uint16_t sz, bool is_pod) {
+        // Fixedvecs compare just like vecs.
+        walk_vec2(is_pod, get_fixedvec_data_range(sz, dp));
+    }
+
     void walk_box2() {
         data<cmp,ptr_pair>::walk_box_contents1();
     }
@@ -349,6 +368,10 @@ class cmp : public data<cmp,ptr_pair> {
         data<cmp,ptr_pair>::walk_uniq_contents1();
     }
 
+    void walk_rptr2() {
+        data<cmp,ptr_pair>::walk_rptr_contents1();
+    }
+
     void walk_iface2() {
         data<cmp,ptr_pair>::walk_box_contents1();
     }