---

yaml
---
r: 3163
b: refs/heads/master
c: 6ed6791
h: refs/heads/master
i:
  3161: f543bec
  3159: 1c440d5
v: v3

Author: Eric Holk

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5563e173e705fcc03c5bcc91a7c0ff620fc7b57
+refs/heads/master: 6ed6791df49d8f33a3f49662e7baf559ef59e604

trunk/src/comp/back/upcall.rs

@@ -40,7 +40,6 @@ type upcalls =
         ValueRef clone_chan,
         ValueRef _yield,
         ValueRef sleep,
-        ValueRef _join,
         ValueRef send,
         ValueRef recv,
         ValueRef _fail,
@@ -91,7 +90,6 @@ fn declare_upcalls(type_names tn, ModuleRef llmod) -> @upcalls {
                           T_opaque_chan_ptr()),
              _yield=dv("yield", empty_vec),
              sleep=dv("sleep", [T_size_t()]),
-             _join=dv("join", [T_taskptr(tn)]),
              send=dv("send", [T_opaque_chan_ptr(), T_ptr(T_i8())]),
              recv=dv("recv", [T_ptr(T_ptr(T_i8())), T_opaque_port_ptr()]),
              _fail=dv("fail", [T_ptr(T_i8()), T_ptr(T_i8()), T_size_t()]),

trunk/src/rt/rust_upcall.cpp

@@ -195,27 +195,6 @@ upcall_sleep(rust_task *task, size_t time_in_us) {
     task->yield(2, time_in_us);
 }
 
-extern "C" CDECL void
-upcall_join(rust_task *task, maybe_proxy<rust_task> *target) {
-    LOG_UPCALL_ENTRY(task);
-
-    if (target->is_proxy()) {
-        rust_handle<rust_task> *task_handle = target->as_proxy()->handle();
-        notify_message::send(notify_message::JOIN, "join",
-                             task->get_handle(), task_handle);
-        task->block(task_handle, "joining remote task");
-        task->yield(2);
-    } else {
-        rust_task *target_task = target->referent();
-        // If the other task is already dying, we don't have to wait for it.
-        if (target_task->dead() == false) {
-            target_task->tasks_waiting_to_join.push(task);
-            task->block(target_task, "joining local task");
-            task->yield(2);
-        }
-    }
-}
-
 /**
  * Buffers a chunk of data in the specified channel.
  *

trunk/src/rt/rustrt.def.in

@@ -51,7 +51,6 @@ upcall_get_type_desc
 upcall_grow_task
 upcall_ivec_resize
 upcall_ivec_spill
-upcall_join
 upcall_kill
 upcall_log_double
 upcall_log_float