---

yaml
---
r: 23137
b: refs/heads/master
c: 4808d59
h: refs/heads/master
i:
  23135: 6cf61e3
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0101125a962abae18525d6014cd26ad10bbb96e6
+refs/heads/master: 4808d59909b9350fcb557ec7e6f0ce21c505e803
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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 => {

trunk/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!");
+}