---

yaml
---
r: 29846
b: refs/heads/incoming
c: 00ef541
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: a57d3e0c152a293885f65cdf44d4b98a5e2f71cc
+refs/heads/incoming: 00ef5418d44a191b464db87b99d8034202c86c7d
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/task.rs

@@ -1025,9 +1025,9 @@ fn kill_taskgroup(state: taskgroup_inner, me: *rust_task, is_main: bool) {
 
 // FIXME (#2912): Work around core-vs-coretest function duplication. Can't use
 // a proper closure because the #[test]s won't understand. Have to fake it.
-unsafe fn taskgroup_key() -> local_data_key<tcb> {
+macro_rules! taskgroup_key {
     // Use a "code pointer" value that will never be a real code pointer.
-    unsafe::transmute((-2 as uint, 0u))
+    {} => (unsafe::transmute((-2 as uint, 0u)))
 }
 
 fn gen_child_taskgroup(linked: bool, supervised: bool)
@@ -1036,7 +1036,8 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
     /*######################################################################*
      * Step 1. Get spawner's taskgroup info.
      *######################################################################*/
-    let spawner_group = match unsafe { local_get(spawner, taskgroup_key()) } {
+    let spawner_group = match unsafe { local_get(spawner,
+                                                 taskgroup_key!()) } {
         none => {
             // Main task, doing first spawn ever. Lazily initialise here.
             let mut members = new_taskset();
@@ -1047,7 +1048,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
             // Main task/group has no ancestors, no notifier, etc.
             let group =
                 @tcb(spawner, tasks, ancestor_list(none), true, none);
-            unsafe { local_set(spawner, taskgroup_key(), group); }
+            unsafe { local_set(spawner, taskgroup_key!(), group); }
             group
         }
         some(group) => group
@@ -1162,7 +1163,7 @@ fn spawn_raw(+opts: task_opts, +f: fn~()) {
             if enlist_many(child, child_arc, &mut ancestors) {
                 let group = @tcb(child, child_arc, ancestors,
                                  is_main, notifier);
-                unsafe { local_set(child, taskgroup_key(), group); }
+                unsafe { local_set(child, taskgroup_key!(), group); }
                 // Run the child's body.
                 f();
                 // TLS cleanup code will exit the taskgroup.
@@ -1261,7 +1262,7 @@ fn spawn_raw(+opts: task_opts, +f: fn~()) {
  *
  * These two cases aside, the interface is safe.
  */
-type local_data_key<T: owned> = fn@(+@T);
+type local_data_key<T: owned> = &fn(+@T);
 
 trait local_data { }
 impl<T: owned> @T: local_data { }