Skip to content

Commit a829d07

Browse files
committed
---
yaml --- r: 44453 b: refs/heads/master c: 7103ca9 h: refs/heads/master i: 44451: 020d139 v: v3
1 parent 7237235 commit a829d07

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
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 22e88d510f09a29a6799c4522d6c6ae83c324a64
2+
refs/heads/master: 7103ca95ac8e92fd32ab65321cd443a7233a48e0
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/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

trunk/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);

trunk/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)