| Index: third_party/tcmalloc/chromium/src/tcmalloc.cc
|
| diff --git a/third_party/tcmalloc/chromium/src/tcmalloc.cc b/third_party/tcmalloc/chromium/src/tcmalloc.cc
|
| index e88f983292714c2afa2be6e939c5ae0958cdc894..f069dac100604b1f41be8217618e8720a15fc654 100644
|
| --- a/third_party/tcmalloc/chromium/src/tcmalloc.cc
|
| +++ b/third_party/tcmalloc/chromium/src/tcmalloc.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2005, Google Inc.
|
| +// Copyright (c) 2011, Google Inc.
|
| // All rights reserved.
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| @@ -122,8 +122,8 @@
|
| #include "base/spinlock.h" // for SpinLockHolder
|
| #include "central_freelist.h" // for CentralFreeListPadded
|
| #include "common.h" // for StackTrace, kPageShift, etc
|
| +#include "free_list.h" // for FL_Init
|
| #include "internal_logging.h" // for ASSERT, TCMalloc_Printer, etc
|
| -#include "linked_list.h" // for SLL_SetNext
|
| #include "malloc_hook-inl.h" // for MallocHook::InvokeNewHook, etc
|
| #include "page_heap.h" // for PageHeap, PageHeap::Stats
|
| #include "page_heap_allocator.h" // for PageHeapAllocator
|
| @@ -1227,7 +1227,7 @@ inline void do_free_with_callback(void* ptr, void (*invalid_free_fn)(void*)) {
|
| heap->Deallocate(ptr, cl);
|
| } else {
|
| // Delete directly into central cache
|
| - tcmalloc::SLL_SetNext(ptr, NULL);
|
| + tcmalloc::FL_Init(ptr);
|
| Static::central_cache()[cl].InsertRange(ptr, ptr, 1);
|
| }
|
| } else {
|
|
|