---

yaml
---
r: 29737
b: refs/heads/incoming
c: 4808d59
h: refs/heads/master
i:
  29735: 2d5440e
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: 0101125a962abae18525d6014cd26ad10bbb96e6
+refs/heads/incoming: 4808d59909b9350fcb557ec7e6f0ce21c505e803
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/pipes.rs

@@ -396,6 +396,23 @@ fn try_recv<T: send, Tbuffer: send>(-p: recv_packet_buffered<T, Tbuffer>)
     let p_ = p.unwrap();
     let p = unsafe { &*p_ };
 
+    struct drop_state {
+        p: &packet_header;
+
+        drop {
+            if task::failing() {
+                io::println("failing!");
+                self.p.state = terminated;
+                let old_task = swap_task(self.p.blocked_task, ptr::null());
+                if !old_task.is_null() {
+                    rustrt::rust_task_deref(old_task);
+                }
+            }
+        }
+    };
+
+    let _drop_state = drop_state { p: &p.header };
+
     // optimistic path
     match p.header.state {
       full => {

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

@@ -0,0 +1,19 @@
+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"];
+        p3.recv();
+    };  
+    #error["parent tries"];
+    assert !p.recv().try_send(());
+    #error("all done!");
+}