---

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

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9470e5d7d56b4e697e6ba96e8f0cc10c64f0bdf0
+refs/heads/master: 3dbce4ebea8b36c873b1b29e5a56d5a8b86feee6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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()
     }