Chromium Code Reviews| Index: src/spaces-inl.h |
| diff --git a/src/spaces-inl.h b/src/spaces-inl.h |
| index e863b519a99c0c06f93471d96428caa703dceb7a..7227f812fe652b466f526c78112b4067821ed46b 100644 |
| --- a/src/spaces-inl.h |
| +++ b/src/spaces-inl.h |
| @@ -253,26 +253,19 @@ HeapObject* PagedSpace::AllocateLinearly(int size_in_bytes) { |
| // Raw allocation. |
| AllocationResult PagedSpace::AllocateRaw(int size_in_bytes) { |
| HeapObject* object = AllocateLinearly(size_in_bytes); |
| - if (object != NULL) { |
| - if (identity() == CODE_SPACE) { |
| - SkipList::Update(object->address(), size_in_bytes); |
| - } |
| - return object; |
| - } |
| - ASSERT(!heap()->linear_allocation() || |
| + ASSERT((object == NULL) || |
| + !heap()->linear_allocation() || |
|
Hannes Payer (out of office)
2014/06/18 09:45:10
I do not think the assert is correct.
I think lin
Igor Sheludko
2014/06/18 12:38:49
It looks outdated so I removed both the ASSERT and
|
| (anchor_.next_chunk() == &anchor_ && |
| anchor_.prev_chunk() == &anchor_)); |
| - object = free_list_.Allocate(size_in_bytes); |
| - if (object != NULL) { |
| - if (identity() == CODE_SPACE) { |
| - SkipList::Update(object->address(), size_in_bytes); |
| + if (object == NULL) { |
| + object = free_list_.Allocate(size_in_bytes); |
| + if (object == NULL) { |
| + object = SlowAllocateRaw(size_in_bytes); |
| } |
| - return object; |
| } |
| - object = SlowAllocateRaw(size_in_bytes); |
| if (object != NULL) { |
| if (identity() == CODE_SPACE) { |
| SkipList::Update(object->address(), size_in_bytes); |