---

yaml
---
r: 53087
b: refs/heads/dist-snap
c: 1a41b48
h: refs/heads/master
i:
  53085: 3fe5931
  53083: 3a76131
  53079: 3a18055
  53071: 05e3098
  53055: e17351d
v: v3

Author: thestinger

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 2e0614750c398c9aac2f4064addb2fa95ba32282
+refs/heads/dist-snap: 1a41b484bf05514f469e69efd56fcd7039d34db9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/rt/memory_region.cpp

@@ -121,8 +121,10 @@ memory_region::realloc(void *mem, size_t orig_size) {
 }
 
 void *
-memory_region::malloc(size_t size, const char *tag, bool zero) {
+memory_region::malloc(size_t size, const char *tag) {
+#   if RUSTRT_TRACK_ALLOCATIONS >= 1
     size_t old_size = size;
+#   endif
     size += HEADER_SIZE;
     alloc_header *mem = (alloc_header *)::malloc(size);
     if (mem == NULL) {
@@ -143,18 +145,9 @@ memory_region::malloc(size_t size, const char *tag, bool zero) {
     void *data = get_data(mem);
     claim_alloc(data);
 
-    if(zero) {
-        memset(data, 0, old_size);
-    }
-
     return data;
 }
 
-void *
-memory_region::calloc(size_t size, const char *tag) {
-    return malloc(size, tag, true);
-}
-
 memory_region::~memory_region() {
     if (_synchronized) { _lock.lock(); }
     if (_live_allocations == 0 && !_detailed_leaks) {

branches/dist-snap/src/rt/memory_region.h

@@ -77,8 +77,7 @@ class memory_region {
 public:
     memory_region(rust_env *env, bool synchronized);
     memory_region(memory_region *parent);
-    void *malloc(size_t size, const char *tag, bool zero = true);
-    void *calloc(size_t size, const char *tag);
+    void *malloc(size_t size, const char *tag);
     void *realloc(void *mem, size_t size);
     void free(void *mem);
     ~memory_region();

branches/dist-snap/src/rt/rust_stack.cpp

@@ -58,7 +58,7 @@ check_stack_canary(stk_seg *stk) {
 stk_seg *
 create_stack(memory_region *region, size_t sz) {
     size_t total_sz = sizeof(stk_seg) + sz;
-    stk_seg *stk = (stk_seg *)region->malloc(total_sz, "stack", false);
+    stk_seg *stk = (stk_seg *)region->malloc(total_sz, "stack");
     memset(stk, 0, sizeof(stk_seg));
     stk->end = (uintptr_t) &stk->data[sz];
     add_stack_canary(stk);

branches/dist-snap/src/rt/rust_task.cpp

@@ -450,11 +450,6 @@ rust_task::backtrace() {
 #endif
 }
 
-void *
-rust_task::calloc(size_t size, const char *tag) {
-    return local_region.calloc(size, tag);
-}
-
 size_t
 rust_task::get_next_stack_size(size_t min, size_t current, size_t requested) {
     LOG(this, mem, "calculating new stack size for 0x%" PRIxPTR, this);