rt: Remove box annihilator

brson · brson · commit 8d932160d921 · 2012-10-23T12:14:46.000-07:00
diff --git a/mk/rt.mk b/mk/rt.mk
@@ -72,7 +72,6 @@ RUNTIME_CS_$(1) := \
               rt/rust_shape.cpp \
               rt/rust_abi.cpp \
               rt/rust_debug.cpp \
-              rt/rust_box_annihilator.cpp \
               rt/memory_region.cpp \
               rt/boxed_region.cpp \
               rt/arch/$$(HOST_$(1))/context.cpp \
diff --git a/src/libcore/gc.rs b/src/libcore/gc.rs
@@ -44,8 +44,6 @@ struct StackSegment {
 
 extern mod rustrt {
     #[legacy_exports];
-    fn rust_annihilate_box(ptr: *Word);
-
     #[rust_stack]
     fn rust_call_tydesc_glue(root: *Word, tydesc: *Word, field: size_t);
 
@@ -330,7 +328,7 @@ pub fn cleanup_stack_for_failure() {
             roots.insert(*root, ());
 
             if ptr::is_null(tydesc) {
-                rustrt::rust_annihilate_box(*root);
+                // XXX: Destroy this box
             } else {
                 rustrt::rust_call_tydesc_glue(*root, tydesc, 3 as size_t);
             }
diff --git a/src/rt/rust_box_annihilator.cpp b/src/rt/rust_box_annihilator.cpp
diff --git a/src/rt/rust_box_annihilator.h b/src/rt/rust_box_annihilator.h
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
@@ -7,7 +7,6 @@
 #include "sync/timer.h"
 #include "rust_abi.h"
 #include "rust_port.h"
-#include "rust_box_annihilator.h"
 
 #include <time.h>
 
@@ -748,12 +747,6 @@ rust_set_exit_status(intptr_t code) {
     task->kernel->set_exit_status((int)code);
 }
 
-extern "C" CDECL void
-rust_annihilate_box(rust_opaque_box *ptr) {
-    rust_task *task = rust_get_current_task();
-    annihilate_box(task, ptr);
-}
-
 extern void log_console_on();
 
 extern "C" CDECL void
diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in
@@ -200,7 +200,6 @@ rust_task_deref
 rust_call_tydesc_glue
 tdefl_compress_mem_to_heap
 tinfl_decompress_mem_to_heap
-rust_annihilate_box
 rust_gc_metadata
 rust_uv_ip4_port
 rust_uv_ip6_port
