| Index: third_party/WebKit/Source/platform/heap/PageMemory.cpp
|
| diff --git a/third_party/WebKit/Source/platform/heap/PageMemory.cpp b/third_party/WebKit/Source/platform/heap/PageMemory.cpp
|
| index d99f9bbd949a3efc8cbe225900994f8ba971f659..16802e2b4cda8ed314ff0f417b9c8a165d2f5267 100644
|
| --- a/third_party/WebKit/Source/platform/heap/PageMemory.cpp
|
| +++ b/third_party/WebKit/Source/platform/heap/PageMemory.cpp
|
| @@ -84,14 +84,14 @@ PageMemoryRegion* RegionTree::lookup(Address address) {
|
| current = current->m_right;
|
| continue;
|
| }
|
| - ASSERT(current->m_region->contains(address));
|
| + DCHECK(current->m_region->contains(address));
|
| return current->m_region;
|
| }
|
| return nullptr;
|
| }
|
|
|
| void RegionTree::add(PageMemoryRegion* region) {
|
| - ASSERT(region);
|
| + DCHECK(region);
|
| RegionTreeNode* newTree = new RegionTreeNode(region);
|
| MutexLocker locker(m_mutex);
|
| newTree->addTo(&m_root);
|
| @@ -100,7 +100,7 @@ void RegionTree::add(PageMemoryRegion* region) {
|
| void RegionTreeNode::addTo(RegionTreeNode** context) {
|
| Address base = m_region->base();
|
| for (RegionTreeNode* current = *context; current; current = *context) {
|
| - ASSERT(!current->m_region->contains(base));
|
| + DCHECK(!current->m_region->contains(base));
|
| context = (base < current->m_region->base()) ? ¤t->m_left
|
| : ¤t->m_right;
|
| }
|
| @@ -113,8 +113,8 @@ void RegionTree::remove(PageMemoryRegion* region) {
|
| // shutdown, but that case is safe. Regardless, we make all removals
|
| // mutually exclusive.
|
| MutexLocker locker(m_mutex);
|
| - ASSERT(region);
|
| - ASSERT(m_root);
|
| + DCHECK(region);
|
| + DCHECK(m_root);
|
| Address base = region->base();
|
| RegionTreeNode** context = &m_root;
|
| RegionTreeNode* current = m_root;
|
| @@ -143,7 +143,7 @@ void RegionTree::remove(PageMemoryRegion* region) {
|
|
|
| PageMemory::PageMemory(PageMemoryRegion* reserved, const MemoryRegion& writable)
|
| : m_reserved(reserved), m_writable(writable) {
|
| - ASSERT(reserved->contains(writable));
|
| + DCHECK(reserved->contains(writable));
|
|
|
| // Register the writable area of the memory as part of the LSan root set.
|
| // Only the writable area is mapped and can contain C++ objects. Those
|
| @@ -165,7 +165,7 @@ static size_t roundToOsPageSize(size_t size) {
|
| }
|
|
|
| PageMemory* PageMemory::allocate(size_t payloadSize, RegionTree* regionTree) {
|
| - ASSERT(payloadSize > 0);
|
| + DCHECK_GT(payloadSize, 0UL);
|
|
|
| // Virtual memory allocation routines operate in OS page sizes.
|
| // Round up the requested size to nearest os page size.
|
| @@ -178,7 +178,7 @@ PageMemory* PageMemory::allocate(size_t payloadSize, RegionTree* regionTree) {
|
| PageMemoryRegion::allocateLargePage(allocationSize, regionTree);
|
| PageMemory* storage =
|
| setupPageMemoryInRegion(pageMemoryRegion, 0, payloadSize);
|
| - RELEASE_ASSERT(storage->commit());
|
| + CHECK(storage->commit());
|
| return storage;
|
| }
|
|
|
|
|