---

yaml
---
r: 77694
b: refs/heads/master
c: 5e80e0c
h: refs/heads/master
v: v3

Author: flaper87

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5fc4045d789ed752c49b9368a2cc9a1cd8c341d5
+refs/heads/master: 5e80e0cbf415219bb4fb483a24bd8cc03836d315
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
 refs/heads/try: ebfe63cd1c0b5d23f7ea60c69b4fde2e30cfd42a

trunk/src/libstd/rt/kill.rs

@@ -648,7 +648,9 @@ impl Death {
     #[inline]
     pub fn allow_kill(&mut self, already_failing: bool) {
         if self.unkillable == 0 {
-            fail!("illegal call of rekillable");
+            // we need to decrement the counter before failing.
+            self.unkillable -= 1;
+            fail!("Cannot enter a rekillable() block without a surrounding unkillable()");
         }
         self.unkillable -= 1;
         if self.unkillable == 0 {

trunk/src/libstd/task/mod.rs

@@ -651,8 +651,8 @@ fn test_kill_unkillable_task() {
     }
 }
 
-#[ignore(reason = "linked failure")]
 #[test]
+#[ignore(cfg(windows))]
 fn test_kill_rekillable_task() {
     use rt::test::*;
 
@@ -672,8 +672,8 @@ fn test_kill_rekillable_task() {
 }
 
 #[test]
-#[ignore(cfg(windows))]
 #[should_fail]
+#[ignore(cfg(windows))]
 fn test_rekillable_not_nested() {
     do rekillable {
         // This should fail before