From 16befb682ef05cd5422fb9cc242cece1bbed0840 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 19 Jan 2013 22:49:20 -0500
Subject: [PATCH] Fix for issue #4547
---
src/rt/rust_task.cpp | 4 +++-
src/test/run-fail/issue-4547.rs | 18 ++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 src/test/run-fail/issue-4547.rs
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 63dc1c9833e21..f9193e06106a3 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -124,7 +124,9 @@ cleanup_task(cleanup_args *args) {
// assert(task->task_local_data != NULL);
task->task_local_data_cleanup(task->task_local_data);
task->task_local_data = NULL;
- } else if (threw_exception && task->id == INIT_TASK_ID) {
+ }
+
+ if (threw_exception && task->id == INIT_TASK_ID) {
// Edge case: If main never spawns any tasks, but fails anyway, TLS
// won't be around to take down the kernel (task.rs:kill_taskgroup,
// rust_task_kill_all). Do it here instead.
diff --git a/src/test/run-fail/issue-4547.rs b/src/test/run-fail/issue-4547.rs
new file mode 100644
index 0000000000000..a0cb03e80a402
--- /dev/null
+++ b/src/test/run-fail/issue-4547.rs
@@ -0,0 +1,18 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//error-pattern:explicit failure
+
+// Regression test for issue 4547
+
+pub fn main() {
+ os::args();
+ fail!();
+}