---

yaml
---
r: 5398
b: refs/heads/master
c: 77f0101
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5209b192558e4adf0baa0981c463dcff61ec0636
+refs/heads/master: 77f0101edb85c574a94e15aa862ca075ed2fb886

trunk/src/rt/rust_task.h

@@ -5,6 +5,8 @@
 #ifndef RUST_TASK_H
 #define RUST_TASK_H
 
+#include <map>
+
 #include "util/array_list.h"
 
 #include "context.h"
@@ -113,6 +115,8 @@ rust_task : public kernel_owned<rust_task>, rust_cond
 
     rust_obstack dynastack;
 
+    std::map<void *,type_desc *> local_allocs;
+
     // Only a pointer to 'name' is kept, so it must live as long as this task.
     rust_task(rust_scheduler *sched,
               rust_task_list *state,

trunk/src/rt/rust_upcall.cpp

@@ -67,6 +67,8 @@ upcall_malloc(rust_task *task, size_t nbytes, type_desc *td) {
 
     void *p = task->malloc(nbytes, "tdesc", td);
 
+    task->local_allocs[p] = td;
+
     LOG(task, mem,
         "upcall malloc(%" PRIdPTR ", 0x%" PRIxPTR ") = 0x%" PRIxPTR,
         nbytes, td, (uintptr_t)p);
@@ -84,6 +86,8 @@ upcall_free(rust_task *task, void* ptr, uintptr_t is_gc) {
     DLOG(sched, mem,
              "upcall free(0x%" PRIxPTR ", is_gc=%" PRIdPTR ")",
              (uintptr_t)ptr, is_gc);
+
+    task->local_allocs.erase(ptr);
     task->free(ptr, (bool) is_gc);
 }