---

pcwalton · pcwalton · commit 317702a2ade0 · 2011-08-29T16:50:06.000-07:00
yaml --- r: 5035 b: refs/heads/master c: f1ed03d h: refs/heads/master i: 5033: 579e675 5031: 8da974c v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a4d43379ead9ca3014ba71bb68b0db08e7e7e94
+refs/heads/master: f1ed03dfa5ae3460d64cb6032da790f04221a153
diff --git a/trunk/src/rt/rust_shape.h b/trunk/src/rt/rust_shape.h
@@ -775,8 +775,9 @@ class data : public ctxt< data<T,U> > {
 
     void walk_fn(bool align) {
         if (align) dp = align_to(dp, sizeof(void *));
+        U next_dp = dp + sizeof(void *) * 2;
         static_cast<T *>(this)->walk_fn(align);
-        dp += sizeof(void *) * 2;
+        dp = next_dp;
     }
 
     void walk_obj(bool align) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 0a4d43379ead9ca3014ba71bb68b0db08e7e7e94`
	`2`	`+refs/heads/master: f1ed03dfa5ae3460d64cb6032da790f04221a153`
Original file line number	Diff line number	Diff line change
`@@ -775,8 +775,9 @@ class data : public ctxt< data<T,U> > {`
`775`	`775`
`776`	`776`	`void walk_fn(bool align) {`
`777`	`777`	`if (align) dp = align_to(dp, sizeof(void *));`
	`778`	`+ U next_dp = dp + sizeof(void ) 2;`
`778`	`779`	`static_cast<T *>(this)->walk_fn(align);`
`779`		`- dp += sizeof(void ) 2;`
	`780`	`+ dp = next_dp;`
`780`	`781`	`}`
`781`	`782`
`782`	`783`	`void walk_obj(bool align) {`