---

eholk · eholk · commit 0f972e4c7224 · 2012-08-08T18:03:28.000-07:00
yaml --- r: 27673 b: refs/heads/try c: e997948 h: refs/heads/master i: 27671: 4588b1b v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: c64ffa4f5b72dacb8d1a62a9dd3cbce5807bb927
+refs/heads/try: e997948c8a70d76ffac3c60867d47f98e698988f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
diff --git a/branches/try/src/libcore/pipes.rs b/branches/try/src/libcore/pipes.rs
@@ -486,9 +486,7 @@ fn sender_terminate<T: send>(p: *packet<T>) {
     let p = unsafe { &*p };
     match swap_state_rel(p.header.state, terminated) {
       empty => {
-        assert p.header.blocked_task.is_null();
         // The receiver will eventually clean up.
-        //unsafe { forget(p) }
       }
       blocked => {
         // wake up the target
@@ -500,7 +498,6 @@ fn sender_terminate<T: send>(p: *packet<T>) {
             rustrt::rust_task_deref(old_task);
         }
         // The receiver will eventually clean up.
-        //unsafe { forget(p) }
       }
       full => {
         // This is impossible
@@ -520,7 +517,6 @@ fn receiver_terminate<T: send>(p: *packet<T>) {
     match swap_state_rel(p.header.state, terminated) {
       empty => {
         // the sender will clean up
-        //unsafe { forget(p) }
       }
       blocked => {
         // this shouldn't happen.

Original file line number	Diff line number	Diff line change
`@@ -486,9 +486,7 @@ fn sender_terminate<T: send>(p: *packet<T>) {`
`486`	`486`	`let p = unsafe { &*p };`
`487`	`487`	`match swap_state_rel(p.header.state, terminated) {`
`488`	`488`	`empty => {`
`489`		`- assert p.header.blocked_task.is_null();`
`490`	`489`	`// The receiver will eventually clean up.`
`491`		`- //unsafe { forget(p) }`
`492`	`490`	`}`
`493`	`491`	`blocked => {`
`494`	`492`	`// wake up the target`
`@@ -500,7 +498,6 @@ fn sender_terminate<T: send>(p: *packet<T>) {`
`500`	`498`	`rustrt::rust_task_deref(old_task);`
`501`	`499`	`}`
`502`	`500`	`// The receiver will eventually clean up.`
`503`		`- //unsafe { forget(p) }`
`504`	`501`	`}`
`505`	`502`	`full => {`
`506`	`503`	`// This is impossible`
`@@ -520,7 +517,6 @@ fn receiver_terminate<T: send>(p: *packet<T>) {`
`520`	`517`	`match swap_state_rel(p.header.state, terminated) {`
`521`	`518`	`empty => {`
`522`	`519`	`// the sender will clean up`
`523`		`- //unsafe { forget(p) }`
`524`	`520`	`}`
`525`	`521`	`blocked => {`
`526`	`522`	`// this shouldn't happen.`