---

yaml
---
r: 29742
b: refs/heads/incoming
c: d2e9d99
h: refs/heads/master
v: v3

Author: eholk

[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: 7634e2911b6cedd7d06bbfd716922c4a750b47ae
+refs/heads/incoming: d2e9d99f819e04d32fe8f87dab9e3b318075cf26
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/pipes.rs

@@ -530,16 +530,20 @@ fn sender_terminate<T: send>(p: *packet<T>) {
 #[doc(hidden)]
 fn receiver_terminate<T: send>(p: *packet<T>) {
     let p = unsafe { &*p };
-    assert p.header.blocked_task.is_null();
     match swap_state_rel(p.header.state, terminated) {
       empty => {
+        assert p.header.blocked_task.is_null();
         // the sender will clean up
       }
       blocked => {
-        // this shouldn't happen.
-        fail ~"terminating a blocked packet"
+        let old_task = swap_task(p.header.blocked_task, ptr::null());
+        if !old_task.is_null() {
+            rustrt::rust_task_deref(old_task);
+            assert old_task == rustrt::rust_get_task();
+        }
       }
       terminated | full => {
+        assert p.header.blocked_task.is_null();
         // I have to clean up, use drop_glue
       }
     }

branches/incoming/src/test/run-pass/issue-3176.rs

@@ -0,0 +1,23 @@
+import pipes::{select2, selectable};
+
+fn main() {
+    let (c,p) = pipes::stream();
+    do task::try {
+        let (c2,p2) = pipes::stream();
+        do task::spawn {
+            p2.recv();
+            #error["brother fails"];
+            fail;
+        }   
+        let (c3,p3) = pipes::stream();
+        c.send(c3);
+        c2.send(());
+        #error["child blocks"];
+        let (c, p) = pipes::stream();
+        (p, p3).select();
+        c.send(());
+    };  
+    #error["parent tries"];
+    assert !p.recv().try_send(());
+    #error("all done!");
+}