RepoMirrors/gperftools
1
0
Fork 0
mirror of https://github.com/gperftools/gperftools synced 2025-01-02 20:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix clang barking at debugallocator's magic2_ field

Browse Source 
It barks because we access the field in a special way through address
computation (see magic2_addr), so it is indeed not accessed
directly. To emphasize that it comes directly after size2_ we simply
converted size2 and magic2_ into explicit array size_and_magic2_.
This commit is contained in:
Aliaksey Kandratsenka 2023-07-13 18:56:19 -04:00
parent c29e3059dd
commit 4b3fc02082
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/debugallocation.cc
View File

@ -304,8 +304,7 @@ class MallocBlock {
// ...
// then come the size2_ and magic2_, or a full page of mprotect-ed memory
// if the malloc_page_fence feature is enabled.
size_t size2_;
size_t magic2_;
size_t size_and_magic2_[2];
private: // static data and helpers
@ -376,9 +375,12 @@ class MallocBlock {
// malloc_page_fence option) then there's no size2 or magic2
// (instead, the guard page begins where size2 would be).
size_t* size2_addr() { return (size_t*)((char*)&size2_ + size1_); }
const size_t* size2_addr() const {
return (const size_t*)((char*)&size2_ + size1_);
return (const size_t*)((const char*)&size_and_magic2_ + size1_);
}
size_t* size2_addr() {
const auto* cthis = this;
return const_cast<size_t*>(cthis->size2_addr());
}
size_t* magic2_addr() { return (size_t*)(size2_addr() + 1); }
@ -489,10 +491,10 @@ class MallocBlock {
public: // public accessors
void* data_addr() { return (void*)&size2_; }
const void* data_addr() const { return (const void*)&size2_; }
void* data_addr() { return (void*)&size_and_magic2_; }
const void* data_addr() const { return (const void*)&size_and_magic2_; }
static size_t data_offset() { return OFFSETOF_MEMBER(MallocBlock, size2_); }
static size_t data_offset() { return OFFSETOF_MEMBER(MallocBlock, size_and_magic2_); }
size_t data_size() const { return size1_; }