---

eholk · eholk · commit bdb38d7bd251 · 2012-06-19T10:31:12.000-07:00
yaml --- r: 13559 b: refs/heads/master c: 2a128fa h: refs/heads/master i: 13557: 4aa9b8c 13555: 3519d66 13551: b7ed888 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: be664ddd2917e13c1c5f05a49476f8b67be85140
+refs/heads/master: 2a128fa205f36074c8fbf4bc490e1ad0f76f38f6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/libcore/arc.rs b/trunk/src/libcore/arc.rs
@@ -102,11 +102,14 @@ impl methods<T> for exclusive<T> {
     fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {
         unsafe {
             let ptr: ~arc_data<ex_data<T>> = unsafe::reinterpret_cast(*self);
-            let rec: &ex_data<T> = &(*ptr).data;
+            let r = {
+                let rec: &ex_data<T> = &(*ptr).data;
+                rec.lock.lock_cond() {|c|
+                    f(c, &rec.data)
+                }
+            };
             unsafe::forget(ptr);
-            rec.lock.lock_cond() {|c|
-                f(c, &rec.data)
-            }
+            r
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,14 @@ impl methods<T> for exclusive<T> {`
`102`	`102`	`fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {`
`103`	`103`	`unsafe {`
`104`	`104`	`let ptr: ~arc_data<ex_data<T>> = unsafe::reinterpret_cast(*self);`
`105`		`- let rec: &ex_data<T> = &(*ptr).data;`
	`105`	`+ let r = {`
	`106`	`+ let rec: &ex_data<T> = &(*ptr).data;`
	`107`	`+ rec.lock.lock_cond() {\|c\|`
	`108`	`+ f(c, &rec.data)`
	`109`	`+ }`
	`110`	`+ };`
`106`	`111`	`unsafe::forget(ptr);`
`107`		`- rec.lock.lock_cond() {\|c\|`
`108`		`- f(c, &rec.data)`
`109`		`- }`
	`112`	`+ r`
`110`	`113`	`}`
`111`	`114`	`}`
`112`	`115`	`}`