---

brson · brson · commit abe82dcc7026 · 2012-10-23T12:14:46.000-07:00
yaml --- r: 36082 b: refs/heads/try2 c: 8d93216 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a469a3524d6f59255dd4482eb966fb4a9ec99b54
+refs/heads/try2: 8d932160d92137e0a7d556a5ff7cfae4e68d5781
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/mk/rt.mk b/branches/try2/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/branches/try2/src/libcore/gc.rs b/branches/try2/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/branches/try2/src/rt/rust_box_annihilator.cpp b/branches/try2/src/rt/rust_box_annihilator.cpp
diff --git a/branches/try2/src/rt/rust_box_annihilator.h b/branches/try2/src/rt/rust_box_annihilator.h
diff --git a/branches/try2/src/rt/rust_builtin.cpp b/branches/try2/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/branches/try2/src/rt/rustrt.def.in b/branches/try2/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
