---

yaml
---
r: 5911
b: refs/heads/master
c: 739b1b5
h: refs/heads/master
i:
  5909: 00a72f4
  5907: 7acebda
  5903: 577b024
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 020726c9816ff47fcdc16877a9256e5a765d6315
+refs/heads/master: 739b1b5b53729085f91fbce0fa9fb0530c9d56ee

trunk/src/rt/rust_cc.cpp

@@ -104,7 +104,10 @@ class irc : public shape::data<irc,shape::ptr> {
     }
 
     void walk_obj() {
-        shape::data<irc,shape::ptr>::walk_obj_contents(dp);
+	dp += sizeof(void *); // skip vtable
+	uint8_t *box_ptr = shape::bump_dp<uint8_t *>(dp);
+	shape::ptr ref_count_dp(box_ptr);
+	maybe_record_irc(ref_count_dp);
     }
 
     void walk_res(const shape::rust_fn *dtor, unsigned n_params,
@@ -491,7 +494,7 @@ class sweep : public shape::data<sweep,shape::ptr> {
     }
 
     void walk_obj() {
-        shape::data<sweep,shape::ptr>::walk_obj_contents(dp);
+	return;
     }
 
     void walk_res(const shape::rust_fn *dtor, unsigned n_params,

trunk/src/test/run-pass/cycle-collection5.rs

@@ -0,0 +1,13 @@
+type foo = { mutable z : fn@() };
+
+fn nop() { }
+fn nop_foo(_y: o, _x : @foo) { }
+
+obj o() {
+}
+
+fn main() {
+    let w = @{ mutable z: bind nop() };
+    let x = bind nop_foo(o(), w);
+    w.z = x;
+}