remove unneeded assert, move get_task_tls to sched_loop

1 files changed, 2 insertions, 20 deletions

diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index 25266242485..87aeca511e9 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -444,22 +444,6 @@ rust_task::record_stack_limit() {
     record_sp_limit(stk->data + LIMIT_OFFSET + RED_ZONE_SIZE);
 }
 
-inline rust_task* __rust_get_task_tls()
-{
-    if (!rust_sched_loop::tls_initialized)
-        return NULL;
-#ifdef __WIN32__
-    rust_task *task = reinterpret_cast<rust_task *>
-        (TlsGetValue(rust_sched_loop::task_key));
-#else
-    rust_task *task = reinterpret_cast<rust_task *>
-        (pthread_getspecific(rust_sched_loop::task_key));
-#endif
-    assert(task && "Couldn't get the task from TLS!");
-    return task;
-
-}
-
 inline rust_task* rust_get_current_task() {
     uintptr_t sp_limit = get_sp_limit();
 
@@ -467,7 +451,7 @@ inline rust_task* rust_get_current_task() {
     // value is sometimes inconveniently set to 0, so we can't use this
     // method of retreiving the task pointer and need to fall back to TLS.
     if (sp_limit == 0)
-        return __rust_get_task_tls();
+        return rust_sched_loop::get_task_tls();
 
     // The stack pointer boundary is stored in a quickly-accessible location
     // in the TCB. From that we can calculate the address of the stack segment
@@ -476,11 +460,9 @@ inline rust_task* rust_get_current_task() {
     uintptr_t seg_addr =
         sp_limit - RED_ZONE_SIZE - LIMIT_OFFSET - sizeof(stk_seg);
     stk_seg *stk = (stk_seg*) seg_addr;
+
     // Make sure we've calculated the right address
     ::check_stack_canary(stk);
-
-    if (stk->task == NULL)
-        return __rust_get_task_tls();
     return stk->task;
 }