Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: third_party/tcmalloc/chromium/src/static_vars.h

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebasec Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/chromium/src/static_vars.h
diff --git a/third_party/tcmalloc/chromium/src/static_vars.h b/third_party/tcmalloc/chromium/src/static_vars.h
index b21fe2b2a875bc4b8a314298681456574b555dc2..185a1d45ea80235602b8d902c82f8da2c86986f4 100644
--- a/third_party/tcmalloc/chromium/src/static_vars.h
+++ b/third_party/tcmalloc/chromium/src/static_vars.h
@@ -65,9 +65,7 @@ class Static {
// must be protected by pageheap_lock.
// Page-level allocator.
- static PageHeap* pageheap() {
- return reinterpret_cast<PageHeap*>(pageheap_memory_);
- }
+ static PageHeap* pageheap() { return pageheap_; }
static PageHeapAllocator<Span>* span_allocator() { return &span_allocator_; }
@@ -105,10 +103,7 @@ class Static {
// is stored in trace->stack[kMaxStackDepth-1].
static StackTrace* growth_stacks_;
- // PageHeap uses a constructor for initialization. Like the members above,
- // we can't depend on initialization order, so pageheap is new'd
- // into this buffer.
- static char pageheap_memory_[sizeof(PageHeap)];
+ static PageHeap* pageheap_;
};
} // namespace tcmalloc
« no previous file with comments | « third_party/tcmalloc/chromium/src/stacktrace_x86_64-inl.h ('k') | third_party/tcmalloc/chromium/src/static_vars.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698