diff --git a/compiler-rt/lib/asan/asan_allocator.cpp b/compiler-rt/lib/asan/asan_allocator.cpp --- a/compiler-rt/lib/asan/asan_allocator.cpp +++ b/compiler-rt/lib/asan/asan_allocator.cpp @@ -1164,7 +1164,7 @@ // ---------------------- Interface ---------------- {{{1 using namespace __asan; -const void *AllocationBegin(const void *p) { +static const void *AllocationBegin(const void *p) { AsanChunk *m = __asan::instance.GetAsanChunkByAddr((uptr)p); if (!m) return nullptr; diff --git a/compiler-rt/lib/dfsan/dfsan_allocator.cpp b/compiler-rt/lib/dfsan/dfsan_allocator.cpp --- a/compiler-rt/lib/dfsan/dfsan_allocator.cpp +++ b/compiler-rt/lib/dfsan/dfsan_allocator.cpp @@ -174,7 +174,7 @@ return DFsanAllocate(nmemb * size, sizeof(u64), true /*zeroise*/); } -const void *AllocationBegin(const void *p) { +static const void *AllocationBegin(const void *p) { if (!p) return nullptr; void *beg = allocator.GetBlockBegin(p); diff --git a/compiler-rt/lib/hwasan/hwasan_allocator.cpp b/compiler-rt/lib/hwasan/hwasan_allocator.cpp --- a/compiler-rt/lib/hwasan/hwasan_allocator.cpp +++ b/compiler-rt/lib/hwasan/hwasan_allocator.cpp @@ -409,7 +409,7 @@ return HwasanChunkView(reinterpret_cast(block), metadata); } -const void *AllocationBegin(const void *p) { +static const void *AllocationBegin(const void *p) { const void *untagged_ptr = UntagPtr(p); if (!untagged_ptr) return nullptr; diff --git a/compiler-rt/lib/lsan/lsan_allocator.cpp b/compiler-rt/lib/lsan/lsan_allocator.cpp --- a/compiler-rt/lib/lsan/lsan_allocator.cpp +++ b/compiler-rt/lib/lsan/lsan_allocator.cpp @@ -145,7 +145,7 @@ *end = *begin + sizeof(AllocatorCache); } -const void *GetMallocBegin(const void *p) { +static const void *GetMallocBegin(const void *p) { if (!p) return nullptr; void *beg = allocator.GetBlockBegin(p); diff --git a/compiler-rt/lib/memprof/memprof_allocator.cpp b/compiler-rt/lib/memprof/memprof_allocator.cpp --- a/compiler-rt/lib/memprof/memprof_allocator.cpp +++ b/compiler-rt/lib/memprof/memprof_allocator.cpp @@ -681,7 +681,7 @@ return 0; } -const void *memprof_malloc_begin(const void *p) { +static const void *memprof_malloc_begin(const void *p) { u64 user_requested_size; MemprofChunk *m = instance.GetMemprofChunkByAddr((uptr)p, user_requested_size); diff --git a/compiler-rt/lib/msan/msan_allocator.cpp b/compiler-rt/lib/msan/msan_allocator.cpp --- a/compiler-rt/lib/msan/msan_allocator.cpp +++ b/compiler-rt/lib/msan/msan_allocator.cpp @@ -260,7 +260,7 @@ return MsanAllocate(stack, nmemb * size, sizeof(u64), true); } -const void *AllocationBegin(const void *p) { +static const void *AllocationBegin(const void *p) { if (!p) return nullptr; void *beg = allocator.GetBlockBegin(p); diff --git a/compiler-rt/lib/tsan/rtl/tsan_mman.cpp b/compiler-rt/lib/tsan/rtl/tsan_mman.cpp --- a/compiler-rt/lib/tsan/rtl/tsan_mman.cpp +++ b/compiler-rt/lib/tsan/rtl/tsan_mman.cpp @@ -352,7 +352,7 @@ return SetErrnoOnNull(user_alloc_internal(thr, pc, sz, PageSize)); } -const void *user_alloc_begin(const void *p) { +static const void *user_alloc_begin(const void *p) { if (p == nullptr || !IsAppMem((uptr)p)) return nullptr; void *beg = allocator()->GetBlockBegin(p);