---

yaml
---
r: 41446
b: refs/heads/snap-stage3
c: 8ebdb1a
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a50d1fdbda6623433eee46e46487ca898776cf97
+refs/heads/snap-stage3: 8ebdb1a11bb356a3ef7ab7f549144e44e0d313ea
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rt/rust_upcall.cpp

@@ -124,23 +124,6 @@ struct s_trace_args {
     size_t line;
 };
 
-extern "C" CDECL void
-upcall_s_trace(s_trace_args *args) {
-    rust_task *task = args->task;
-    LOG_UPCALL_ENTRY(task);
-    LOG(task, trace, "Trace %s:%d: %s",
-        args->file, args->line, args->msg);
-}
-
-extern "C" CDECL void
-upcall_trace(char const *msg,
-             char const *file,
-             size_t line) {
-    rust_task *task = rust_get_current_task();
-    s_trace_args args = {task,msg,file,line};
-    UPCALL_SWITCH_STACK(task, &args, upcall_s_trace);
-}
-
 /**********************************************************************
  * Allocate an object in the exchange heap
  */
@@ -302,17 +285,6 @@ rust_upcall_free(void* ptr) {
     upcall_free(ptr);
 }
 
-/**********************************************************************
- * Sanity checks on boxes, insert when debugging possible
- * use-after-free bugs.  See maybe_validate_box() in trans.rs.
- */
-
-extern "C" CDECL void
-upcall_validate_box(rust_opaque_box* ptr) {
-    // XXX: Remove after snapshot
-    abort();
-}
-
 /**********************************************************************/
 
 extern "C" _Unwind_Reason_Code
@@ -369,12 +341,6 @@ upcall_rust_personality(int version,
     return args.retval;
 }
 
-extern "C" void
-upcall_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
-    // XXX: Remove after snapshot
-    abort();
-}
-
 // NB: This needs to be blazing fast. Don't switch stacks
 extern "C" CDECL void *
 upcall_new_stack(size_t stk_sz, void *args_addr, size_t args_sz) {

branches/snap-stage3/src/rt/rustrt.def.in

@@ -60,10 +60,7 @@ task_clear_event_reject
 task_wait_event
 task_signal_event
 upcall_fail
-upcall_trace
 upcall_free
-upcall_validate_box
-upcall_log_type
 upcall_malloc
 upcall_rust_personality
 upcall_call_shim_on_c_stack