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

Unified Diff: third_party/WebKit/Source/platform/heap/HeapPage.cpp

Issue 2698673003: Call HeapObjectHeader::checkHeader solely for its side-effect. (Closed)
Patch Set: Use DCHECK on a bool instead of DCHECK_EQ. Created 3 years, 9 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/WebKit/Source/platform/heap/HeapPage.cpp
diff --git a/third_party/WebKit/Source/platform/heap/HeapPage.cpp b/third_party/WebKit/Source/platform/heap/HeapPage.cpp
index c1f6ae426a5e869d5dc0ee1f71ee9d39d6b6da35..5060a23f9a4d482e82a219a950fea783cce7b49e 100644
--- a/third_party/WebKit/Source/platform/heap/HeapPage.cpp
+++ b/third_party/WebKit/Source/platform/heap/HeapPage.cpp
@@ -91,7 +91,7 @@ namespace blink {
#if DCHECK_IS_ON() && CPU(64BIT)
NO_SANITIZE_ADDRESS
void HeapObjectHeader::zapMagic() {
- ASSERT(checkHeader());
+ checkHeader();
m_magic = zappedMagic;
}
#endif
@@ -706,7 +706,7 @@ bool NormalPageArena::coalesce() {
headerAddress += size;
continue;
}
- ASSERT(header->checkHeader());
+ header->checkHeader();
if (startOfGap != headerAddress)
addToFreeList(startOfGap, headerAddress - startOfGap);
@@ -725,7 +725,7 @@ bool NormalPageArena::coalesce() {
void NormalPageArena::promptlyFreeObject(HeapObjectHeader* header) {
ASSERT(!getThreadState()->sweepForbidden());
- ASSERT(header->checkHeader());
+ header->checkHeader();
Address address = reinterpret_cast<Address>(header);
Address payload = header->payload();
size_t size = header->size();
@@ -753,7 +753,7 @@ bool NormalPageArena::expandObject(HeapObjectHeader* header, size_t newSize) {
// It's possible that Vector requests a smaller expanded size because
// Vector::shrinkCapacity can set a capacity smaller than the actual payload
// size.
- ASSERT(header->checkHeader());
+ header->checkHeader();
if (header->payloadSize() >= newSize)
return true;
size_t allocationSize = ThreadHeap::allocationSizeFromSize(newSize);
@@ -774,7 +774,7 @@ bool NormalPageArena::expandObject(HeapObjectHeader* header, size_t newSize) {
}
bool NormalPageArena::shrinkObject(HeapObjectHeader* header, size_t newSize) {
- ASSERT(header->checkHeader());
+ header->checkHeader();
ASSERT(header->payloadSize() > newSize);
size_t allocationSize = ThreadHeap::allocationSizeFromSize(newSize);
ASSERT(header->size() > allocationSize);
@@ -1003,7 +1003,7 @@ Address LargeObjectArena::doAllocateLargeObjectPage(size_t allocationSize,
ASSERT(!(reinterpret_cast<uintptr_t>(result) & allocationMask));
LargeObjectPage* largeObject = new (largeObjectAddress)
LargeObjectPage(pageMemory, this, allocationSize);
- ASSERT(header->checkHeader());
+ header->checkHeader();
// Poison the object header and allocationGranularity bytes after the object
ASAN_POISON_MEMORY_REGION(header, sizeof(*header));
@@ -1261,7 +1261,7 @@ size_t NormalPage::objectPayloadSizeForTesting() {
HeapObjectHeader* header =
reinterpret_cast<HeapObjectHeader*>(headerAddress);
if (!header->isFree()) {
- ASSERT(header->checkHeader());
+ header->checkHeader();
objectPayloadSize += header->payloadSize();
}
ASSERT(header->size() < blinkPagePayloadSize());
@@ -1577,7 +1577,7 @@ HeapObjectHeader* NormalPage::findHeaderFromAddress(Address address) {
HeapObjectHeader* header = reinterpret_cast<HeapObjectHeader*>(objectAddress);
if (header->isFree())
return nullptr;
- ASSERT(header->checkHeader());
+ header->checkHeader();
return header;
}
@@ -1594,7 +1594,7 @@ static bool isUninitializedMemory(void* objectPointer, size_t objectSize) {
#endif
static void markPointer(Visitor* visitor, HeapObjectHeader* header) {
- ASSERT(header->checkHeader());
+ header->checkHeader();
const GCInfo* gcInfo = ThreadHeap::gcInfo(header->gcInfoIndex());
if (gcInfo->hasVTable() && !vTableInitialized(header->payload())) {
// We hit this branch when a GC strikes before GarbageCollected<>'s
« no previous file with comments | « third_party/WebKit/Source/platform/heap/HeapPage.h ('k') | third_party/WebKit/Source/platform/heap/Member.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698