---

yaml
---
r: 14431
b: refs/heads/try
c: c16bfbe
h: refs/heads/master
i:
  14429: d6c78f9
  14427: 93f268d
  14423: d0d1032
  14415: f09156e
  14399: 4e7881e
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 27ab663845e66d908ec4e4549d333e95561dbe26
+refs/heads/try: c16bfbe0c365b6d3f0c274a53bc1374822766e6b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_log.cpp

@@ -106,6 +106,10 @@ rust_log::trace_ln(char *prefix, char *message) {
 void
 rust_log::trace_ln(rust_task *task, uint32_t level, char *message) {
 
+    if (task) {
+        // There is not enough room to be logging on the rust stack
+        assert(!task->on_rust_stack() && "logging on rust stack");
+    }
 
     // FIXME: The scheduler and task names used to have meaning,
     // but they are always equal to 'main' currently

branches/try/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) {