From c11d0b0aa0343fbc6ddf8114ce96904c9870de8a Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 6 Dec 2011 20:55:03 -0800
Subject: [PATCH] rt: Move upcall_cmp_type/upcall_log_type to rust_upcall.cpp

---
 src/rt/rust_shape.cpp  |  8 ++++----
 src/rt/rust_upcall.cpp | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/rt/rust_shape.cpp b/src/rt/rust_shape.cpp
index 326e4e2a514..3593d0ff335 100644
--- a/src/rt/rust_shape.cpp
+++ b/src/rt/rust_shape.cpp
@@ -530,9 +530,9 @@ log::walk_res(const rust_fn *dtor, unsigned n_params,
 } // end namespace shape
 
 extern "C" void
-upcall_cmp_type(int8_t *result, const type_desc *tydesc,
-                const type_desc **subtydescs, uint8_t *data_0,
-                uint8_t *data_1, uint8_t cmp_type) {
+shape_cmp_type(int8_t *result, const type_desc *tydesc,
+	       const type_desc **subtydescs, uint8_t *data_0,
+	       uint8_t *data_1, uint8_t cmp_type) {
     rust_task *task = rust_scheduler::get_task();
     shape::arena arena;
 
@@ -553,7 +553,7 @@ upcall_cmp_type(int8_t *result, const type_desc *tydesc,
 }
 
 extern "C" void
-upcall_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
+shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
     rust_task *task = rust_scheduler::get_task();
     if (task->sched->log_lvl < level)
         return;     // TODO: Don't evaluate at all?
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 40cb35f0149..c971119342c 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -457,6 +457,26 @@ upcall_rust_personality(int version,
     return upcall_s_rust_personality(&args);
 }
 
+extern "C" void
+shape_cmp_type(int8_t *result, const type_desc *tydesc,
+               const type_desc **subtydescs, uint8_t *data_0,
+               uint8_t *data_1, uint8_t cmp_type);
+
+extern "C" void
+upcall_cmp_type(int8_t *result, const type_desc *tydesc,
+                const type_desc **subtydescs, uint8_t *data_0,
+                uint8_t *data_1, uint8_t cmp_type) {
+    shape_cmp_type(result, tydesc, subtydescs, data_0, data_1, cmp_type);
+}
+
+extern "C" void
+shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level);
+
+extern "C" void
+upcall_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
+    shape_log_type(tydesc, data, level);
+}
+
 //
 // Local Variables:
 // mode: C++