AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[heap] Enforce size checks in allocation stats.

Browse Source 
This CL should be reverted after investigating the size chrasher.

BUG=chromium:556912
LOG=n

Review URL: https://codereview.chromium.org/1455273003

Cr-Commit-Position: refs/heads/master@{#32119}
This commit is contained in:
hpayer 2015-11-19 07:55:14 -08:00 committed by Commit bot
parent a698fd849b
commit 1682935911
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/heap/spaces.cc
View File

@ -2707,7 +2707,8 @@ void PagedSpace::PrepareForMarkCompact() {
intptr_t PagedSpace::SizeOfObjects() { intptr_t PagedSpace::SizeOfObjects() {
const intptr_t size = Size() - (limit() - top()); const intptr_t size = Size() - (limit() - top());
DCHECK_GE(size, 0); CHECK_GE(limit(), top());
CHECK_GE(size, 0);
USE(size); USE(size);
return size; return size;
} }

18
src/heap/spaces.h
View File

@ -1541,7 +1541,10 @@ class AllocationStats BASE_EMBEDDED {
// Accessors for the allocation statistics. // Accessors for the allocation statistics.
intptr_t Capacity() { return capacity_; } intptr_t Capacity() { return capacity_; }
intptr_t MaxCapacity() { return max_capacity_; } intptr_t MaxCapacity() { return max_capacity_; }
intptr_t Size() { return size_; } intptr_t Size() {
CHECK_GE(size_, 0);
return size_;
}
// Grow the space by adding available bytes. They are initially marked as // Grow the space by adding available bytes. They are initially marked as
// being in use (part of the size), but will normally be immediately freed, // being in use (part of the size), but will normally be immediately freed,
@ -1552,7 +1555,7 @@ class AllocationStats BASE_EMBEDDED {
if (capacity_ > max_capacity_) { if (capacity_ > max_capacity_) {
max_capacity_ = capacity_; max_capacity_ = capacity_;
} }
DCHECK(size_ >= 0); CHECK(size_ >= 0);
} }
// Shrink the space by removing available bytes. Since shrinking is done // Shrink the space by removing available bytes. Since shrinking is done
@ -1561,19 +1564,19 @@ class AllocationStats BASE_EMBEDDED {
void ShrinkSpace(int size_in_bytes) { void ShrinkSpace(int size_in_bytes) {
capacity_ -= size_in_bytes; capacity_ -= size_in_bytes;
size_ -= size_in_bytes; size_ -= size_in_bytes;
DCHECK(size_ >= 0); CHECK(size_ >= 0);
} }
// Allocate from available bytes (available -> size). // Allocate from available bytes (available -> size).
void AllocateBytes(intptr_t size_in_bytes) { void AllocateBytes(intptr_t size_in_bytes) {
size_ += size_in_bytes; size_ += size_in_bytes;
DCHECK(size_ >= 0); CHECK(size_ >= 0);
} }
// Free allocated bytes, making them available (size -> available). // Free allocated bytes, making them available (size -> available).
void DeallocateBytes(intptr_t size_in_bytes) { void DeallocateBytes(intptr_t size_in_bytes) {
size_ -= size_in_bytes; size_ -= size_in_bytes;
DCHECK_GE(size_, 0); CHECK_GE(size_, 0);
} }
// Merge {other} into {this}. // Merge {other} into {this}.
@ -1583,12 +1586,13 @@ class AllocationStats BASE_EMBEDDED {
if (other.max_capacity_ > max_capacity_) { if (other.max_capacity_ > max_capacity_) {
max_capacity_ = other.max_capacity_; max_capacity_ = other.max_capacity_;
} }
CHECK_GE(size_, 0);
} }
void DecreaseCapacity(intptr_t size_in_bytes) { void DecreaseCapacity(intptr_t size_in_bytes) {
capacity_ -= size_in_bytes; capacity_ -= size_in_bytes;
DCHECK_GE(capacity_, 0); CHECK_GE(capacity_, 0);
DCHECK_GE(capacity_, size_); CHECK_GE(capacity_, size_);
} }
void IncreaseCapacity(intptr_t size_in_bytes) { capacity_ += size_in_bytes; } void IncreaseCapacity(intptr_t size_in_bytes) { capacity_ += size_in_bytes; }