---

yaml
---
r: 29766
b: refs/heads/incoming
c: 3dbce4e
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 9470e5d7d56b4e697e6ba96e8f0cc10c64f0bdf0
+refs/heads/incoming: 3dbce4ebea8b36c873b1b29e5a56d5a8b86feee6
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/sync.rs

@@ -315,6 +315,7 @@ impl &rwlock {
      * tasks may run concurrently with this one.
      */
     fn read<U>(blk: fn() -> U) -> U {
+        let mut release = none;
         unsafe {
             do task::unkillable {
                 do (&self.order_lock).access {
@@ -328,9 +329,9 @@ impl &rwlock {
                         (&self.access_lock).acquire();
                     }
                 }
+                release = some(rwlock_release_read(self));
             }
         }
-        let _z = rwlock_release_read(self);
         blk()
     }