| Index: src/heap.cc
 | 
| diff --git a/src/heap.cc b/src/heap.cc
 | 
| index 6db1459825368155f802f585ef5dc9f4661a5fe3..0b60a04e347f714649f7e64f27e9c9699f84390a 100644
 | 
| --- a/src/heap.cc
 | 
| +++ b/src/heap.cc
 | 
| @@ -2936,7 +2936,7 @@ MaybeObject* Heap::AllocateHeapNumber(double value, PretenureFlag pretenure) {
 | 
|    // Statically ensure that it is safe to allocate heap numbers in paged
 | 
|    // spaces.
 | 
|    int size = HeapNumber::kSize;
 | 
| -  STATIC_ASSERT(HeapNumber::kSize <= Page::kNonCodeObjectAreaSize);
 | 
| +  STATIC_ASSERT(HeapNumber::kSize <= Page::kMaxNonCodeHeapObjectSize);
 | 
|    AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure);
 | 
|  
 | 
|    Object* result;
 | 
| @@ -2952,7 +2952,7 @@ MaybeObject* Heap::AllocateHeapNumber(double value, PretenureFlag pretenure) {
 | 
|  
 | 
|  MaybeObject* Heap::AllocateCell(Object* value) {
 | 
|    int size = Cell::kSize;
 | 
| -  STATIC_ASSERT(Cell::kSize <= Page::kNonCodeObjectAreaSize);
 | 
| +  STATIC_ASSERT(Cell::kSize <= Page::kMaxNonCodeHeapObjectSize);
 | 
|  
 | 
|    Object* result;
 | 
|    { MaybeObject* maybe_result = AllocateRaw(size, CELL_SPACE, CELL_SPACE);
 | 
| @@ -2966,7 +2966,7 @@ MaybeObject* Heap::AllocateCell(Object* value) {
 | 
|  
 | 
|  MaybeObject* Heap::AllocatePropertyCell() {
 | 
|    int size = PropertyCell::kSize;
 | 
| -  STATIC_ASSERT(PropertyCell::kSize <= Page::kNonCodeObjectAreaSize);
 | 
| +  STATIC_ASSERT(PropertyCell::kSize <= Page::kMaxNonCodeHeapObjectSize);
 | 
|  
 | 
|    Object* result;
 | 
|    MaybeObject* maybe_result =
 | 
| @@ -5348,7 +5348,7 @@ MaybeObject* Heap::AllocateHashTable(int length, PretenureFlag pretenure) {
 | 
|  
 | 
|  MaybeObject* Heap::AllocateSymbol() {
 | 
|    // Statically ensure that it is safe to allocate symbols in paged spaces.
 | 
| -  STATIC_ASSERT(Symbol::kSize <= Page::kNonCodeObjectAreaSize);
 | 
| +  STATIC_ASSERT(Symbol::kSize <= Page::kMaxNonCodeHeapObjectSize);
 | 
|  
 | 
|    Object* result;
 | 
|    MaybeObject* maybe =
 | 
| 
 |