---

yaml
---
r: 6879
b: refs/heads/master
c: 00af340
h: refs/heads/master
i:
  6877: f1b2ed9
  6875: b173ffc
  6871: 26ed7f2
  6863: 5b9eff2
  6847: bf66054
v: v3

Author: Elly Jones

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2715f3c6417aa1cb32991afd6a9bcaae5d40cbe
+refs/heads/master: 00af3406fece208b1d19053b46f1400d8d8cbb00

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*2)
-#define RZ_LINUX_64 (1024*2)
+#define RZ_LINUX_32 (1024*20)
+#define RZ_LINUX_64 (1024*20)
 #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,6 +41,7 @@ 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);
@@ -71,6 +72,7 @@ upcall_call_shim_on_c_stack(void *args, void *fn_ptr) {
 
     task = rust_scheduler::get_task();
     task->record_stack_limit();
+    do_sanity_check(task);
 }
 
 /**********************************************************************/
@@ -409,10 +411,6 @@ 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();
 }
 
 /**********************************************************************
@@ -647,7 +645,7 @@ upcall_reset_stack_limit() {
     rust_task *task = rust_scheduler::get_task();
     do_sanity_check(task);
     task->reset_stack_limit();
-    task->check_stack_canary();
+    do_sanity_check(task);
 }
 
 //

trunk/src/rustdoc/rustdoc.rs

@@ -1,18 +1,5 @@
-/* rustdoc - rust->markdown translator
- *
+/* rustdoc: rust -> markdown translator
  * Copyright 2011 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 use std;