From eed5c0aa249f3e17bbabeeba1650ab699e3dff5a Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 25 Jun 2010 16:54:03 -0700
Subject: [PATCH] Add rust_task::gc(size_t args) method that drops us back into
 the GC glue.

---
 src/rt/rust_crate.cpp  | 5 +++++
 src/rt/rust_internal.h | 3 +++
 src/rt/rust_task.cpp   | 8 ++++++++
 3 files changed, 16 insertions(+)

diff --git a/src/rt/rust_crate.cpp b/src/rt/rust_crate.cpp
index d609ac64718..369782708df 100644
--- a/src/rt/rust_crate.cpp
+++ b/src/rt/rust_crate.cpp
@@ -26,6 +26,11 @@ rust_crate::get_unwind_glue() const {
   return ((uintptr_t)this + unwind_glue_off);
 }
 
+uintptr_t
+rust_crate::get_gc_glue() const {
+  return ((uintptr_t)this + gc_glue_off);
+}
+
 uintptr_t
 rust_crate::get_yield_glue() const {
   return ((uintptr_t)this + yield_glue_off);
diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h
index 3c4fde2a24c..7f70301265d 100644
--- a/src/rt/rust_internal.h
+++ b/src/rt/rust_internal.h
@@ -660,6 +660,9 @@ rust_task : public rc_base<rust_task>,
     // Fail self, assuming caller-on-stack is this task.
     void fail(size_t nargs);
 
+    // Run the gc glue on the task stack.
+    void gc(size_t nargs);
+
     // Notify tasks waiting for us that we are about to die.
     void notify_waiting_tasks();
 
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index beba11a0931..3f85f51ac7b 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -345,6 +345,14 @@ rust_task::fail(size_t nargs) {
     }
 }
 
+void
+rust_task::gc(size_t nargs)
+{
+    dom->log(rust_log::TASK|rust_log::MEM,
+             "task 0x%" PRIxPTR " garbage collecting", this);
+    run_after_return(nargs, dom->root_crate->get_gc_glue());
+}
+
 void
 rust_task::notify_waiting_tasks()
 {