---

jld · jld · commit 250aa8f47f3e · 2013-04-21T20:15:57.000-07:00
yaml --- r: 57698 b: refs/heads/incoming c: 7f45ae5 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 3830040a89297dd55f920ec26ab97fb2e33c7a00
+refs/heads/incoming: 7f45ae54ea6609febda24a116e8c30b8fcda466b
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/gc.rs b/branches/incoming/src/libcore/gc.rs
@@ -73,7 +73,6 @@ pub mod rustrt {
         pub unsafe fn rust_gc_metadata() -> *Word;
 
         pub unsafe fn rust_get_stack_segment() -> *StackSegment;
-        pub unsafe fn rust_get_c_stack() -> *StackSegment;
     }
 }
 
diff --git a/branches/incoming/src/llvm b/branches/incoming/src/llvm
@@ -1 +1 @@
-Subproject commit 56dd407f4f97a01b8df6554c569170d2fc276fcb
+Subproject commit 2e9f0d21fe321849a4759a01fc28eae82ef196d6
diff --git a/branches/incoming/src/rt/rust_builtin.cpp b/branches/incoming/src/rt/rust_builtin.cpp
@@ -549,11 +549,6 @@ rust_get_stack_segment() {
     return rust_get_current_task()->stk;
 }
 
-extern "C" CDECL stk_seg *
-rust_get_c_stack() {
-    return rust_get_current_task()->get_c_stack();
-}
-
 extern "C" CDECL void
 start_task(rust_task *target, fn_env_pair *f) {
     target->start(f->f, f->env, NULL);
diff --git a/branches/incoming/src/rt/rust_task.h b/branches/incoming/src/rt/rust_task.h
@@ -374,7 +374,6 @@ rust_task : public kernel_owned<rust_task>
     void call_on_c_stack(void *args, void *fn_ptr);
     void call_on_rust_stack(void *args, void *fn_ptr);
     bool have_c_stack() { return c_stack != NULL; }
-    stk_seg *get_c_stack() { return c_stack; }
 
     rust_task_state get_state() { return state; }
     rust_cond *get_cond() { return cond; }
diff --git a/branches/incoming/src/rt/rustrt.def.in b/branches/incoming/src/rt/rustrt.def.in
@@ -49,7 +49,6 @@ rust_task_is_unwinding
 rust_get_task
 rust_try_get_task
 rust_get_stack_segment
-rust_get_c_stack
 rust_log_str
 start_task
 vec_reserve_shared_actual

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ pub mod rustrt {`
`73`	`73`	`pub unsafe fn rust_gc_metadata() -> *Word;`
`74`	`74`
`75`	`75`	`pub unsafe fn rust_get_stack_segment() -> *StackSegment;`
`76`		`- pub unsafe fn rust_get_c_stack() -> *StackSegment;`
`77`	`76`	`}`
`78`	`77`	`}`
`79`	`78`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 56dd407f4f97a01b8df6554c569170d2fc276fcb`
	`1`	`+Subproject commit 2e9f0d21fe321849a4759a01fc28eae82ef196d6`