---

yaml
---
r: 6881
b: refs/heads/master
c: f5c4cc7
h: refs/heads/master
i:
  6879: 33d5312
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c83cc5792f696e9e44f6c8eba7562f874710f93d
+refs/heads/master: f5c4cc70d61c9fddcf3954e9cef19dcb94e15ea4

trunk/src/rt/rust_task.cpp

@@ -18,8 +18,8 @@
 // The amount of extra space at the end of each stack segment, available
 // to the rt, compiler and dynamic linker for running small functions
 // FIXME: We want this to be 128 but need to slim the red zone calls down
-#define RZ_LINUX_32 (1024*20)
-#define RZ_LINUX_64 (1024*20)
+#define RZ_LINUX_32 (1024*2)
+#define RZ_LINUX_64 (1024*2)
 #define RZ_MAC_32   (1024*20)
 #define RZ_MAC_64   (1024*20)
 #define RZ_WIN_32   (1024*20)

trunk/src/rt/rust_upcall.cpp

@@ -41,7 +41,6 @@ call_upcall_on_c_stack(void *args, void *fn_ptr) {
     do_sanity_check(task);
     rust_scheduler *sched = task->sched;
     sched->c_context.call_shim_on_c_stack(args, fn_ptr);
-    do_sanity_check(task);
 }
 
 extern "C" void record_sp(void *limit);
@@ -72,7 +71,6 @@ upcall_call_shim_on_c_stack(void *args, void *fn_ptr) {
 
     task = rust_scheduler::get_task();
     task->record_stack_limit();
-    do_sanity_check(task);
 }
 
 /**********************************************************************/
@@ -411,6 +409,10 @@ upcall_vec_push(rust_vec** vp, type_desc* elt_ty, void* elt) {
     // because this upcall calls take glue
     s_vec_push_args args = {vp, elt_ty, elt};
     upcall_s_vec_push(&args);
+
+    // Do the stack check to make sure this op, on the Rust stack, is behaving
+    rust_task *task = rust_scheduler::get_task();
+    task->check_stack_canary();
 }
 
 /**********************************************************************
@@ -645,7 +647,7 @@ upcall_reset_stack_limit() {
     rust_task *task = rust_scheduler::get_task();
     do_sanity_check(task);
     task->reset_stack_limit();
-    do_sanity_check(task);
+    task->check_stack_canary();
 }
 
 //