Module Name: src
Committed By: christos
Date: Mon Mar 4 17:20:07 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: extent.c
Log Message:
fix for shadowing.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/extent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/extent.c
diff -u src/external/bsd/jemalloc/dist/src/extent.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/extent.c:1.2
--- src/external/bsd/jemalloc/dist/src/extent.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/extent.c Mon Mar 4 12:20:07 2019
@@ -1113,14 +1113,14 @@ extent_recycle(tsdn_t *tsdn, arena_t *ar
if (*zero) {
void *addr = extent_base_get(extent);
- size_t size = extent_size_get(extent);
+ size_t sz = extent_size_get(extent);
if (!extent_zeroed_get(extent)) {
- if (pages_purge_forced(addr, size)) {
- memset(addr, 0, size);
+ if (pages_purge_forced(addr, sz)) {
+ memset(addr, 0, sz);
}
} else if (config_debug) {
size_t *p = (size_t *)(uintptr_t)addr;
- for (size_t i = 0; i < size / sizeof(size_t); i++) {
+ for (size_t i = 0; i < sz / sizeof(size_t); i++) {
assert(p[i] == 0);
}
}
@@ -1365,18 +1365,18 @@ extent_grow_retained(tsdn_t *tsdn, arena
extent_addr_randomize(tsdn, extent, alignment);
}
if (slab) {
- rtree_ctx_t rtree_ctx_fallback;
- rtree_ctx_t *rtree_ctx = tsdn_rtree_ctx(tsdn,
- &rtree_ctx_fallback);
+ rtree_ctx_t rtree_ctx_fallback1;
+ rtree_ctx_t *rtree_ctx1 = tsdn_rtree_ctx(tsdn,
+ &rtree_ctx_fallback1);
extent_slab_set(extent, true);
- extent_interior_register(tsdn, rtree_ctx, extent, szind);
+ extent_interior_register(tsdn, rtree_ctx1, extent, szind);
}
if (*zero && !extent_zeroed_get(extent)) {
void *addr = extent_base_get(extent);
- size_t size = extent_size_get(extent);
- if (pages_purge_forced(addr, size)) {
- memset(addr, 0, size);
+ size_t sz = extent_size_get(extent);
+ if (pages_purge_forced(addr, sz)) {
+ memset(addr, 0, sz);
}
}
