about summary refs log tree commit diff
path: root/src/rt/rust_upcall.cpp
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2012-02-03 09:34:42 +0100
committerMarijn Haverbeke <marijnh@gmail.com>2012-02-03 11:34:12 +0100
commitc1b075d042cabb90f804f3d73e6a4f4b512aa697 (patch)
treeac1501fb72bff6b04597c054c138ae2fc8ce24dc /src/rt/rust_upcall.cpp
parent1ea184285eec782f90ecf4e77c854edfb0269e1b (diff)
downloadrust-c1b075d042cabb90f804f3d73e6a4f4b512aa697.tar.gz
rust-c1b075d042cabb90f804f3d73e6a4f4b512aa697.zip
Remove experimental GC code
It's been sitting unused long enough to have bitrotted completely.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
-rw-r--r--src/rt/rust_upcall.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 09ad8d930c6..fc9e8af9f02 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "rust_cc.h"
-#include "rust_gc.h"
 #include "rust_internal.h"
 #include "rust_scheduler.h"
 #include "rust_unwind.h"
@@ -122,7 +121,6 @@ upcall_s_malloc(s_malloc_args *args) {
 
     LOG(task, mem, "upcall malloc(0x%" PRIxPTR ")", args->td);
 
-    gc::maybe_gc(task);
     cc::maybe_cc(task);
 
     // FIXME--does this have to be calloc?
@@ -151,7 +149,6 @@ upcall_malloc(type_desc *td) {
 
 struct s_free_args {
     void *ptr;
-    uintptr_t is_gc;
 };
 
 extern "C" CDECL void
@@ -162,7 +159,7 @@ upcall_s_free(s_free_args *args) {
     rust_scheduler *sched = task->sched;
     DLOG(sched, mem,
              "upcall free(0x%" PRIxPTR ", is_gc=%" PRIdPTR ")",
-             (uintptr_t)args->ptr, args->is_gc);
+             (uintptr_t)args->ptr);
 
     debug::maybe_untrack_origin(task, args->ptr);
 
@@ -171,8 +168,8 @@ upcall_s_free(s_free_args *args) {
 }
 
 extern "C" CDECL void
-upcall_free(void* ptr, uintptr_t is_gc) {
-    s_free_args args = {ptr, is_gc};
+upcall_free(void* ptr) {
+    s_free_args args = {ptr};
     UPCALL_SWITCH_STACK(&args, upcall_s_free);
 }