---

brson · brson · commit b36ce51c548d · 2011-12-18T15:23:44.000-08:00
yaml --- r: 6804 b: refs/heads/master c: f57fd8d h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74d5faa86e1bd1fc678ae3e5aee49e8445470002
+refs/heads/master: f57fd8de1f771b48055e665950dc678fbaf38de1
diff --git a/trunk/src/rt/rust_task.cpp b/trunk/src/rt/rust_task.cpp
@@ -284,7 +284,9 @@ void task_start_wrapper(spawn_args *a)
         failed = true;
     }
 
-    cc::do_cc(task);
+    // We're on the Rust stack and the cycle collector may recurse arbitrarily
+    // deep, so switch to the C stack
+    task->sched->c_context.call_shim_on_c_stack(task, (void*)cc::do_cc);
 
     rust_closure_env* env = (rust_closure_env*)a->a3;
     if(env) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 74d5faa86e1bd1fc678ae3e5aee49e8445470002`
	`2`	`+refs/heads/master: f57fd8de1f771b48055e665950dc678fbaf38de1`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,9 @@ void task_start_wrapper(spawn_args *a)`
`284`	`284`	`failed = true;`
`285`	`285`	`}`
`286`	`286`
`287`		`- cc::do_cc(task);`
	`287`	`+ // We're on the Rust stack and the cycle collector may recurse arbitrarily`
	`288`	`+ // deep, so switch to the C stack`
	`289`	`+ task->sched->c_context.call_shim_on_c_stack(task, (void*)cc::do_cc);`
`288`	`290`
`289`	`291`	`rust_closure_env* env = (rust_closure_env*)a->a3;`
`290`	`292`	`if(env) {`