---

yaml
---
r: 56343
b: refs/heads/auto
c: e6c4471
h: refs/heads/master
i:
  56341: 5ee0858
  56339: c930886
  56335: b8e442f
v: v3

Author: huonw

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 7f45ae54ea6609febda24a116e8c30b8fcda466b
+refs/heads/auto: e6c4471ed8c54a035f1cc2096d04cc44fd4cd14b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/gc.rs

@@ -73,6 +73,7 @@ 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;
     }
 }
 

branches/auto/src/libstd/num/rational.rs

@@ -51,7 +51,7 @@ impl<T: Copy + Num + Ord>
     #[inline(always)]
     pub fn new(numer: T, denom: T) -> Ratio<T> {
         if denom == Zero::zero() {
-            fail!(~"quotient of 0");
+            fail!(~"denominator == 0");
         }
         let mut ret = Ratio::new_raw(numer, denom);
         ret.reduce();

branches/auto/src/llvm

@@ -1 +1 @@
-Subproject commit 2e9f0d21fe321849a4759a01fc28eae82ef196d6
+Subproject commit 56dd407f4f97a01b8df6554c569170d2fc276fcb

branches/auto/src/rt/rust_builtin.cpp

@@ -549,6 +549,11 @@ 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);

branches/auto/src/rt/rust_task.h

@@ -374,6 +374,7 @@ 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; }

branches/auto/src/rt/rustrt.def.in

@@ -49,6 +49,7 @@ 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