Skip to content

Commit 8bee47e

Browse files
committed
---
yaml --- r: 47645 b: refs/heads/incoming c: 7103ca9 h: refs/heads/master i: 47643: 9fd44e6 v: v3
1 parent ba11f93 commit 8bee47e

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 22e88d510f09a29a6799c4522d6c6ae83c324a64
9+
refs/heads/incoming: 7103ca95ac8e92fd32ab65321cd443a7233a48e0
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rt/rust_exchange_alloc.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@
1818
uintptr_t exchange_count = 0;
1919

2020
void *
21-
rust_exchange_alloc::malloc(size_t size, bool zero) {
21+
rust_exchange_alloc::malloc(size_t size) {
2222
void *value = ::malloc(size);
2323
assert(value);
24-
if (zero) {
25-
memset(value, 0, size);
26-
}
2724

2825
sync::increment(exchange_count);
2926

branches/incoming/src/rt/rust_exchange_alloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class rust_exchange_alloc {
1818
public:
19-
void *malloc(size_t size, bool zero = true);
19+
void *malloc(size_t size);
2020
void *calloc(size_t size);
2121
void *realloc(void *mem, size_t size);
2222
void free(void *mem);

branches/incoming/src/rt/rust_stack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ destroy_stack(memory_region *region, stk_seg *stk) {
7575
stk_seg *
7676
create_exchange_stack(rust_exchange_alloc *exchange, size_t sz) {
7777
size_t total_sz = sizeof(stk_seg) + sz;
78-
stk_seg *stk = (stk_seg *)exchange->malloc(total_sz, false);
78+
stk_seg *stk = (stk_seg *)exchange->malloc(total_sz);
7979
memset(stk, 0, sizeof(stk_seg));
8080
stk->end = (uintptr_t) &stk->data[sz];
8181
add_stack_canary(stk);

0 commit comments

Comments
 (0)