From 6b8ef771a9de9318964f8b5b7cff5ea3958f0294 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Thu, 9 Feb 2017 12:31:11 -0800 Subject: [PATCH] Fix rtree_subkey() regression. Fix rtree_subkey() to use uintptr_t rather than unsigned for key bitmasking. This regression was introduced by 4a346f55939af4f200121cc4454089592d952f18 (Replace rtree path cache with LRU cache.). --- include/jemalloc/internal/rtree_inlines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/jemalloc/internal/rtree_inlines.h b/include/jemalloc/internal/rtree_inlines.h index 4de04795..f2efd710 100644 --- a/include/jemalloc/internal/rtree_inlines.h +++ b/include/jemalloc/internal/rtree_inlines.h @@ -40,7 +40,7 @@ rtree_subkey(uintptr_t key, unsigned level) { unsigned cumbits = rtree_levels[level].cumbits; unsigned shiftbits = ptrbits - cumbits; unsigned maskbits = rtree_levels[level].bits; - unsigned mask = (ZU(1) << maskbits) - 1; + uintptr_t mask = (ZU(1) << maskbits) - 1; return ((key >> shiftbits) & mask); }