diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-02-22 22:29:38 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-02-22 22:30:21 -0800 |
| commit | c16bfbe0c365b6d3f0c274a53bc1374822766e6b (patch) | |
| tree | bb8c2b8afbf411488989c94f46470f22a865bdc5 /src/rt/rust_task.cpp | |
| parent | 27ab663845e66d908ec4e4549d333e95561dbe26 (diff) | |
| download | rust-c16bfbe0c365b6d3f0c274a53bc1374822766e6b.tar.gz rust-c16bfbe0c365b6d3f0c274a53bc1374822766e6b.zip | |
rt: Stop logging on the Rust stack. Closes #1478
Diffstat (limited to 'src/rt/rust_task.cpp')
| -rw-r--r-- | src/rt/rust_task.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index 14c223ddb91..f8fd01d4a49 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -196,7 +196,6 @@ void task_start_wrapper(spawn_args *a) if(env) { // free the environment (which should be a unique closure). const type_desc *td = env->td; - LOG(task, task, "Freeing env %p with td %p", env, td); td->drop_glue(NULL, NULL, td->first_param, box_body(env)); upcall_free_shared_type_desc(env->td); upcall_shared_free(env); @@ -720,6 +719,11 @@ Returns true if we're currently running on the Rust stack */ bool rust_task::on_rust_stack() { + if (stk == NULL) { + // This only happens during construction + return false; + } + uintptr_t sp = get_sp(); bool in_first_segment = sp_in_stk_seg(sp, stk); if (in_first_segment) { |