---

msullivan · brson · commit d8ed6e253a8e · 2011-06-27T12:34:45.000-07:00
yaml --- r: 3373 b: refs/heads/master c: 99b4fff h: refs/heads/master i: 3371: 6b562fa v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec809188654b4b4c8defef4f2baead6e7518cf36
+refs/heads/master: 99b4fff4d28d460c25965fe3a88b1544d297cc02
diff --git a/trunk/src/rt/rust_upcall.cpp b/trunk/src/rt/rust_upcall.cpp
@@ -480,7 +480,7 @@ upcall_vec_append(rust_task *task, type_desc *t, type_desc *elem_t,
 
     // If src and dst are the same (due to "v += v"), then dst getting
     // resized causes src to move as well.
-    if (dst == src) {
+    if (dst == src && !need_copy) {
         src = new_vec;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: ec809188654b4b4c8defef4f2baead6e7518cf36`
	`2`	`+refs/heads/master: 99b4fff4d28d460c25965fe3a88b1544d297cc02`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ upcall_vec_append(rust_task task, type_desc t, type_desc *elem_t,`
`480`	`480`
`481`	`481`	`// If src and dst are the same (due to "v += v"), then dst getting`
`482`	`482`	`// resized causes src to move as well.`
`483`		`- if (dst == src) {`
	`483`	`+ if (dst == src && !need_copy) {`
`484`	`484`	`src = new_vec;`
`485`	`485`	`}`
`486`	`486`