---

yaml
---
r: 15708
b: refs/heads/try
c: f32d9f4
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: dc6c3a8946981740f2f59c80bc259593c700fb46
+refs/heads/try: f32d9f4853e878cdd721d5120aea023e901f81d4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_box_annihilator.cpp

@@ -43,7 +43,7 @@ class annihilator : public shape::data<annihilator,shape::ptr> {
         : shape::data<annihilator,shape::ptr>(in_task, in_align, in_sp,
                                         in_params, in_tables, in_data) {}
 
-    void walk_vec2(bool is_pod, uint16_t sp_size) {
+    void walk_vec2(bool is_pod) {
         void *vec = shape::get_dp<void *>(dp);
         walk_vec2(is_pod, get_vec_data_range(dp));
         task->kernel->free(vec);

branches/try/src/rt/rust_cc.cpp

@@ -73,7 +73,7 @@ class irc : public shape::data<irc,shape::ptr> {
                                   in_tables, in_data),
       ircs(in_ircs) {}
 
-    void walk_vec2(bool is_pod, uint16_t sp_size) {
+    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.
 
@@ -305,7 +305,7 @@ class mark : public shape::data<mark,shape::ptr> {
                                    in_tables, in_data),
       marked(in_marked) {}
 
-    void walk_vec2(bool is_pod, uint16_t sp_size) {
+    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.
 

branches/try/src/rt/rust_shape.cpp

@@ -337,7 +337,7 @@ class cmp : public data<cmp,ptr_pair> {
                          in_dp),
       result(0) {}
 
-    void walk_vec2(bool is_pod, uint16_t sp_size) {
+    void walk_vec2(bool is_pod) {
         walk_vec2(is_pod, get_vec_data_range(dp));
     }
 

branches/try/src/rt/rust_shape.h

@@ -429,7 +429,7 @@ ctxt<T>::walk_vec0() {
     uint16_t sp_size = get_u16_bump(sp);
     const uint8_t *end_sp = sp + sp_size;
 
-    static_cast<T *>(this)->walk_vec1(is_pod, sp_size);
+    static_cast<T *>(this)->walk_vec1(is_pod);
 
     sp = end_sp;
 }
@@ -569,7 +569,7 @@ class print : public ctxt<print> {
                    const type_param *params, const uint8_t *end_sp);
     void walk_var1(uint8_t param);
 
-    void walk_vec1(bool is_pod, uint16_t sp_size) {
+    void walk_vec1(bool is_pod) {
         DPRINT("vec<"); walk(); DPRINT(">");
     }
     void walk_uniq1() {
@@ -645,7 +645,7 @@ class size_of : public ctxt<size_of> {
     void walk_tydesc1(char) { sa.set(sizeof(void *),   sizeof(void *)); }
     void walk_closure1();
 
-    void walk_vec1(bool is_pod, uint16_t sp_size) {
+    void walk_vec1(bool is_pod) {
         sa.set(sizeof(void *), sizeof(void *));
     }
 
@@ -903,8 +903,8 @@ class data : public ctxt< data<T,U> > {
         static_cast<T *>(this)->walk_struct2(end_sp);
     }
 
-    void walk_vec1(bool is_pod, uint16_t sp_size) {
-        DATA_SIMPLE(void *, walk_vec2(is_pod, sp_size));
+    void walk_vec1(bool is_pod) {
+        DATA_SIMPLE(void *, walk_vec2(is_pod));
     }
 
     void walk_box1() { DATA_SIMPLE(void *, walk_box2()); }
@@ -1102,7 +1102,7 @@ class log : public data<log,ptr> {
       out(other.out),
       prefix("") {}
 
-    void walk_vec2(bool is_pod, uint16_t sp_size) {
+    void walk_vec2(bool is_pod) {
         if (!get_dp<void *>(dp))
             out << prefix << "(null)";
         else