From bd8f6097a77206e34fbbe9592a3cc61111562d63 Mon Sep 17 00:00:00 2001
From: Michael Sullivan <sully@msully.net>
Date: Wed, 15 Jun 2011 18:03:15 -0700
Subject: [PATCH] Get rid of old vec_append glue.

---
 mk/rt.mk                |  2 +-
 src/comp/back/upcall.rs |  4 ----
 src/rt/rust_upcall.cpp  | 18 ++++++++----------
 src/rt/rustrt.def.in    |  2 --
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/mk/rt.mk b/mk/rt.mk
index cd18e0597d8..b6a3b882164 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -30,7 +30,7 @@ RUNTIME_CS := rt/sync/timer.cpp \
               rt/test/rust_test_util.cpp \
               rt/arch/i386/context.cpp \
 
-RUNTIME_LL := rt/vec_append.ll
+RUNTIME_LL :=
 
 RUNTIME_S := rt/arch/i386/_context.s
 
diff --git a/src/comp/back/upcall.rs b/src/comp/back/upcall.rs
index f0ee56ca79e..604ca8a5b58 100644
--- a/src/comp/back/upcall.rs
+++ b/src/comp/back/upcall.rs
@@ -51,7 +51,6 @@ type upcalls =
         ValueRef mark,
         ValueRef new_str,
         ValueRef new_vec,
-        ValueRef vec_grow,
         ValueRef vec_append,
         ValueRef get_type_desc,
         ValueRef new_task,
@@ -106,9 +105,6 @@ fn declare_upcalls(type_names tn, ModuleRef llmod) -> @upcalls {
                        T_ptr(T_str())),
              new_vec=d("new_vec", [T_size_t(), T_ptr(T_tydesc(tn))],
                        T_opaque_vec_ptr()),
-             vec_grow=d("vec_grow",
-                        [T_opaque_vec_ptr(), T_size_t(), T_ptr(T_int()),
-                         T_ptr(T_tydesc(tn))], T_opaque_vec_ptr()),
              vec_append=d("vec_append",
                           [T_ptr(T_tydesc(tn)), T_ptr(T_tydesc(tn)),
                            T_ptr(T_opaque_vec_ptr()), T_opaque_vec_ptr(),
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index e8c8e45e1c6..bfb72ffd648 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -370,17 +370,16 @@ upcall_new_vec(rust_task *task, size_t fill, type_desc *td) {
     return v;
 }
 
-extern "C" CDECL rust_vec *
-upcall_vec_grow(rust_task *task,
-                rust_vec *v,
-                size_t n_bytes,
-                uintptr_t *need_copy,
-                type_desc *td)
+static rust_vec *
+vec_grow(rust_task *task,
+         rust_vec *v,
+         size_t n_bytes,
+         uintptr_t *need_copy,
+         type_desc *td)
 {
-    LOG_UPCALL_ENTRY(task);
     rust_dom *dom = task->dom;
     LOG(task, mem,
-        "upcall vec_grow(0x%" PRIxPTR ", %" PRIdPTR
+        "vec_grow(0x%" PRIxPTR ", %" PRIdPTR
         "), rc=%" PRIdPTR " alloc=%" PRIdPTR ", fill=%" PRIdPTR
         ", need_copy=0x%" PRIxPTR,
         v, n_bytes, v->ref_count, v->alloc, v->fill, need_copy);
@@ -465,8 +464,7 @@ upcall_vec_append(rust_task *task, type_desc *t, type_desc *elem_t,
     uintptr_t need_copy;
     size_t n_src_bytes = skip_null ? src->fill - 1 : src->fill;
     size_t n_dst_bytes = skip_null ? dst->fill - 1 : dst->fill;
-    rust_vec *new_vec = upcall_vec_grow(task, dst, n_src_bytes,
-                                        &need_copy, t);
+    rust_vec *new_vec = vec_grow(task, dst, n_src_bytes, &need_copy, t);
 
     if (need_copy) {
         // Copy any dst elements in, omitting null if doing str.
diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in
index be4a5a8d96e..9fb1b45287e 100644
--- a/src/rt/rustrt.def.in
+++ b/src/rt/rustrt.def.in
@@ -24,7 +24,6 @@ rust_process_wait
 rust_ptr_eq
 rust_run_program
 rust_start
-rust_vec_append_glue
 size_of
 squareroot
 str_alloc
@@ -73,7 +72,6 @@ upcall_start_task
 upcall_start_thread
 upcall_trace_str
 upcall_trace_word
-upcall_vec_grow
 upcall_vec_append
 upcall_yield
 vec_alloc