Index: third_party/tcmalloc/chromium/src/page_heap_allocator.h |
diff --git a/third_party/tcmalloc/chromium/src/page_heap_allocator.h b/third_party/tcmalloc/chromium/src/page_heap_allocator.h |
index eee1590323511ec0ae312c6ad256f60fe16a493e..d83528203f1a0ff935d72547753fe3f5f344102e 100644 |
--- a/third_party/tcmalloc/chromium/src/page_heap_allocator.h |
+++ b/third_party/tcmalloc/chromium/src/page_heap_allocator.h |
@@ -36,9 +36,7 @@ |
#include <stddef.h> // for NULL, size_t |
#include "common.h" // for MetaDataAlloc |
-#include "free_list.h" // for FL_Push/FL_Pop |
-#include "internal_logging.h" // for ASSERT, CRASH |
-#include "system-alloc.h" // for TCMalloc_SystemAddGuard |
+#include "internal_logging.h" // for ASSERT |
namespace tcmalloc { |
@@ -64,31 +62,20 @@ class PageHeapAllocator { |
// Consult free list |
void* result; |
if (free_list_ != NULL) { |
- result = FL_Pop(&free_list_); |
+ result = free_list_; |
+ free_list_ = *(reinterpret_cast<void**>(result)); |
} else { |
if (free_avail_ < sizeof(T)) { |
// Need more room. We assume that MetaDataAlloc returns |
// suitably aligned memory. |
free_area_ = reinterpret_cast<char*>(MetaDataAlloc(kAllocIncrement)); |
if (free_area_ == NULL) { |
- CRASH("FATAL ERROR: Out of memory trying to allocate internal " |
- "tcmalloc data (%d bytes, object-size %d)\n", |
- kAllocIncrement, static_cast<int>(sizeof(T))); |
- } |
- |
- // This guard page protects the metadata from being corrupted by a |
- // buffer overrun. We currently have no mechanism for freeing it, since |
- // we never release the metadata buffer. If that changes we'll need to |
- // add something like TCMalloc_SystemRemoveGuard. |
- size_t guard_size = TCMalloc_SystemAddGuard(free_area_, |
- kAllocIncrement); |
- free_area_ += guard_size; |
- free_avail_ = kAllocIncrement - guard_size; |
- if (free_avail_ < sizeof(T)) { |
- CRASH("FATAL ERROR: Insufficient memory to guard internal tcmalloc " |
- "data (%d bytes, object-size %d, guard-size %d)\n", |
- kAllocIncrement, static_cast<int>(sizeof(T)), guard_size); |
+ Log(kCrash, __FILE__, __LINE__, |
+ "FATAL ERROR: Out of memory trying to allocate internal " |
+ "tcmalloc data (bytes, object-size)", |
+ kAllocIncrement, sizeof(T)); |
} |
+ free_avail_ = kAllocIncrement; |
} |
result = free_area_; |
free_area_ += sizeof(T); |
@@ -99,7 +86,8 @@ class PageHeapAllocator { |
} |
void Delete(T* p) { |
- FL_Push(&free_list_, p); |
+ *(reinterpret_cast<void**>(p)) = free_list_; |
+ free_list_ = p; |
inuse_--; |
} |