---

yaml
---
r: 22659
b: refs/heads/master
c: 81f1081
h: refs/heads/master
i:
  22657: 78272a7
  22655: 3da9029
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d8c75cfbe7951f62296b4c9311811a0f414ab0f7
+refs/heads/master: 81f108154a9b419427363484a35423462abdb1b5
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/comm.rs

@@ -474,9 +474,7 @@ fn test_listen() {
 #[ignore(cfg(windows))]
 fn test_port_detach_fail() {
     for iter::repeat(100u) {
-        let builder = task::builder();
-        task::unsupervise(builder);
-        do task::run(builder) {
+        do task::spawn_unlinked {
             let po = port();
             let ch = po.chan();
 

trunk/src/libcore/priv.rs

@@ -210,9 +210,7 @@ fn test_weaken_task_then_unweaken() {
 
 #[test]
 fn test_weaken_task_wait() {
-    let builder = task::builder();
-    task::unsupervise(builder);
-    do task::run(builder) {
+    do task::spawn_unlinked {
         unsafe {
             do weaken_task |po| {
                 comm::recv(po);
@@ -231,9 +229,7 @@ fn test_weaken_task_stress() {
                 }
             }
         }
-        let builder = task::builder();
-        task::unsupervise(builder);
-        do task::run(builder) {
+        do task::spawn_unlinked {
             unsafe {
                 do weaken_task |po| {
                     // Wait for it to tell us to die

trunk/src/libcore/task.rs

@@ -51,6 +51,7 @@ export run_listener;
 export run_with;
 
 export spawn;
+export spawn_unlinked;
 export spawn_with;
 export spawn_listener;
 export spawn_sched;
@@ -73,10 +74,6 @@ export thread_per_task;
 export manual_threads;
 export osmain;
 
-// FIXME (See #2945): This shouldn't be exported, but is to work around
-// what appears to be a metadata bug.
-export local_data;
-
 /* Data types */
 
 /// A handle to a task
@@ -434,6 +431,17 @@ fn spawn(+f: fn~()) {
     run(builder(), f);
 }
 
+fn spawn_unlinked(+f: fn~()) {
+    /*!
+     * Creates a child task unlinked from the current one. If either this
+     * task or the child task fails, the other will not be killed.
+     */
+
+    let b = builder();
+    unsupervise(b);
+    run(b, f);
+}
+
 fn spawn_with<A:send>(+arg: A, +f: fn~(+A)) {
     /*!
      * Runs a task, while transfering ownership of one argument to the
@@ -1163,12 +1171,8 @@ fn test_spawn_raw_unsupervise() {
 fn test_spawn_unlinked_unsup_no_fail_down() { // grandchild sends on a port
     let po = comm::port();
     let ch = comm::chan(po);
-    let builder = task::builder();
-    task::unsupervise(builder);
-    do task::run(builder) {
-        let builder = task::builder();
-        task::unsupervise(builder);
-        do task::run(builder) {
+    do task::spawn_unlinked {
+        do task::spawn_unlinked {
             // Give middle task a chance to fail-but-not-kill-us.
             for iter::repeat(8192) { task::yield(); }
             comm::send(ch, ()); // If killed first, grandparent hangs.
@@ -1179,9 +1183,7 @@ fn test_spawn_unlinked_unsup_no_fail_down() { // grandchild sends on a port
 }
 #[test] #[ignore(cfg(windows))]
 fn test_spawn_unlinked_unsup_no_fail_up() { // child unlinked fails
-    let builder = task::builder();
-    task::unsupervise(builder);
-    do task::run(builder) { fail; }
+    do task::spawn_unlinked { fail; }
 }
 #[test] #[ignore(cfg(windows))]
 fn test_spawn_unlinked_sup_no_fail_up() { // child unlinked fails

trunk/src/rustc/driver/session.rs

@@ -39,7 +39,6 @@ const coherence: uint = 512u;
 const borrowck_stats: uint = 1024u;
 const borrowck_note_pure: uint = 2048;
 const borrowck_note_loan: uint = 4096;
-const no_landing_pads: uint = 8192;
 
 fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
     ~[(~"ppregions", ~"prettyprint regions with \
@@ -59,9 +58,7 @@ fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
      (~"borrowck-note-pure", ~"note where purity is req'd",
       borrowck_note_pure),
      (~"borrowck-note-loan", ~"note where loans are req'd",
-      borrowck_note_loan),
-     (~"no-landing-pads", ~"omit landing pads for unwinding",
-      no_landing_pads)
+      borrowck_note_loan)
     ]
 }
 

trunk/src/rustc/middle/trans/base.rs

@@ -3224,10 +3224,6 @@ fn invoke(bcx: block, llfn: ValueRef, llargs: ~[ValueRef]) -> block {
 }
 
 fn need_invoke(bcx: block) -> bool {
-    if (bcx.ccx().sess.opts.debugging_opts & session::no_landing_pads != 0) {
-        ret false;
-    }
-
     if have_cached_lpad(bcx) {
         ret true;
     }

trunk/src/test/run-pass/lots-a-fail.rs

@@ -14,8 +14,6 @@ fn iloop() {
 
 fn main() {
     for uint::range(0u, 100u) |_i| {
-        let builder = task::builder();
-        task::unsupervise(builder);
-        task::run(builder, || iloop() );
+        task::spawn_unlinked(|| iloop() );
     }
-}
+}

trunk/src/test/run-pass/pipe-detect-term.rs

@@ -27,9 +27,7 @@ fn main() {
 
     sleep(iotask, 100);
 
-    let b = task::builder();
-    task::unsupervise(b);
-    task::run(b, failtest);
+    task::spawn_unlinked(failtest);
 }
 
 // Make sure the right thing happens during failure.

trunk/src/test/run-pass/send-iloop.rs

@@ -22,8 +22,6 @@ fn iloop() {
 
 fn main() {
     for uint::range(0u, 16u) |_i| {
-        let builder = task::builder();
-        task::unsupervise(builder);
-        task::run(builder, || iloop() );
+        task::spawn_unlinked(|| iloop() );
     }
-}
+}

trunk/src/test/run-pass/task-killjoin-rsrc.rs

@@ -1,5 +1,3 @@
-// xfail-test
-
 // A port of task-killjoin to use a class with a dtor to manage
 // the join.
 
@@ -10,7 +8,7 @@ class notify {
     let ch: comm::chan<bool>; let v: @mut bool;
     new(ch: comm::chan<bool>, v: @mut bool) { self.ch = ch; self.v = v; }
     drop {
-        #error~["notify: task=%? v=%x unwinding=%b b=%b",
+        #error["notify: task=%? v=%x unwinding=%b b=%b",
                task::get_task(),
                ptr::addr_of(*(self.v)) as uint,
                task::failing(),
@@ -20,11 +18,10 @@ class notify {
     }
 }
 
-fn joinable(f: fn~()) -> comm::port<bool> {
-    fn wrapper(+pair: (comm::chan<bool>, fn())) {
-        let (c, f) = pair;
+fn joinable(+f: fn~()) -> comm::port<bool> {
+    fn wrapper(+c: comm::chan<bool>, +f: fn()) {
         let b = @mut false;
-        #error~["wrapper: task=%? allocated v=%x",
+        #error["wrapper: task=%? allocated v=%x",
                task::get_task(),
                ptr::addr_of(*b) as uint];
         let _r = notify(c, b);
@@ -33,7 +30,7 @@ fn joinable(f: fn~()) -> comm::port<bool> {
     }
     let p = comm::port();
     let c = comm::chan(p);
-    let _ = task::spawn {|| wrapper((c, f)) };
+    do task::spawn_unlinked { wrapper(c, copy f) };
     p
 }
 
@@ -50,17 +47,14 @@ fn supervised() {
     fail;
 }
 
-fn supervisor(b: task::builder) {
-    // Unsupervise this task so the process doesn't return a failure status as
-    // a result of the main task being killed.
-    task::unsupervise(b);
+fn supervisor() {
     #error["supervisor task=%?", task::get_task()];
     let t = joinable(supervised);
     join(t);
 }
 
 fn main() {
-    join(joinable({|| supervisor(task::builder())}));
+    join(joinable(supervisor));
 }
 
 // Local Variables:

trunk/src/test/run-pass/task-killjoin.rs

@@ -20,13 +20,11 @@ fn supervisor() {
     // Unsupervise this task so the process doesn't return a failure status as
     // a result of the main task being killed.
     let f = supervised;
-    task::try(|| supervised() );
+    task::try(supervised);
 }
 
 fn main() {
-    let builder = task::builder();
-    task::unsupervise(builder);
-    task::run(builder, || supervisor() )
+    task::spawn_unlinked(supervisor)
 }
 
 // Local Variables:

trunk/src/test/run-pass/too-much-recursion.rs

@@ -1,14 +1,12 @@
 // xfail-win32
 // error-pattern:ran out of stack
 
-// Test that the task fails after hiting the recursion limit, but
+// Test that the task fails after hitting the recursion limit, but
 // that it doesn't bring down the whole proc
 
 fn main() {
-    let builder = task::builder();
-    task::unsupervise(builder);
-    do task::run(builder) {
+    do task::spawn_unlinked {
         fn f() { f() };
         f();
     };
-}
+}

trunk/src/test/run-pass/unwind-box.rs

@@ -8,7 +8,5 @@ fn f() {
 }
 
 fn main() {
-    let builder = task::builder();
-    task::unsupervise(builder);
-    task::run(builder, || f() );
-}
+    task::spawn_unlinked(f);
+}

trunk/src/test/run-pass/unwind-resource.rs

@@ -21,9 +21,7 @@ fn f(c: comm::chan<bool>) {
 fn main() {
     let p = comm::port();
     let c = comm::chan(p);
-    let builder = task::builder();
-    task::unsupervise(builder);
-    task::run(builder, || f(c) );
+    task::spawn_unlinked(|| f(c) );
     #error("hiiiiiiiii");
     assert comm::recv(p);
-}
+}

trunk/src/test/run-pass/unwind-resource2.rs

@@ -15,7 +15,5 @@ fn f() {
 }
 
 fn main() {
-    let builder = task::builder();
-    task::unsupervise(builder);
-    task::run(builder, || f() );
-}
+    task::spawn_unlinked(f);
+}

trunk/src/test/run-pass/unwind-unique.rs

@@ -8,7 +8,5 @@ fn f() {
 }
 
 fn main() {
-    let builder = task::builder();
-    task::unsupervise(builder);
-    task::run(builder, || f() );
-}
+    task::spawn_unlinked(f);
+}