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-21 15:01:19 +0100
committerMarijn Haverbeke <marijnh@gmail.com>2012-02-21 17:08:14 +0100
commitb1d7f252a9fce3881f48df25197e6d03f94ea8da (patch)
tree806c7c7a4e73a7c380255bbf2e27d90f3534ad1b /src/rt/rust_upcall.cpp
parent389aff333d17053878823fc8e6b09096f8eeb78c (diff)
downloadrust-b1d7f252a9fce3881f48df25197e6d03f94ea8da.tar.gz
rust-b1d7f252a9fce3881f48df25197e6d03f94ea8da.zip
Remove unused tydesc argument to upcall_shared_malloc
Diffstat (limited to 'src/rt/rust_upcall.cpp')
-rw-r--r--src/rt/rust_upcall.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index fcd9483eb63..affaa3e8f9c 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -217,7 +217,6 @@ upcall_validate_box(rust_opaque_box* ptr) {
 struct s_shared_malloc_args {
     uintptr_t retval;
     size_t nbytes;
-    type_desc *td;
 };
 
 extern "C" CDECL void
@@ -225,21 +224,17 @@ upcall_s_shared_malloc(s_shared_malloc_args *args) {
     rust_task *task = rust_task_thread::get_task();
     LOG_UPCALL_ENTRY(task);
 
-    LOG(task, mem,
-        "upcall shared_malloc(%" PRIdPTR ", 0x%" PRIxPTR ")",
-        args->nbytes, args->td);
+    LOG(task, mem, "upcall shared_malloc(%" PRIdPTR ")", args->nbytes);
     void *p = task->kernel->malloc(args->nbytes, "shared malloc");
     memset(p, '\0', args->nbytes);
-    LOG(task, mem,
-        "upcall shared_malloc(%" PRIdPTR ", 0x%" PRIxPTR
-        ") = 0x%" PRIxPTR,
-        args->nbytes, args->td, (uintptr_t)p);
+    LOG(task, mem, "upcall shared_malloc(%" PRIdPTR ") = 0x%" PRIxPTR,
+        args->nbytes, (uintptr_t)p);
     args->retval = (uintptr_t) p;
 }
 
 extern "C" CDECL uintptr_t
-upcall_shared_malloc(size_t nbytes, type_desc *td) {
-    s_shared_malloc_args args = {0, nbytes, td};
+upcall_shared_malloc(size_t nbytes) {
+    s_shared_malloc_args args = {0, nbytes};
     UPCALL_SWITCH_STACK(&args, upcall_s_shared_malloc);
     return args.retval;
 }