| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef V8_HEAP_HEAP_INL_H_ | 5 #ifndef V8_HEAP_HEAP_INL_H_ |
| 6 #define V8_HEAP_HEAP_INL_H_ | 6 #define V8_HEAP_HEAP_INL_H_ |
| 7 | 7 |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "src/base/platform/platform.h" | 10 #include "src/base/platform/platform.h" |
| 11 #include "src/counters.h" | 11 #include "src/counters.h" |
| 12 #include "src/heap/heap.h" | 12 #include "src/heap/heap.h" |
| 13 #include "src/heap/incremental-marking-inl.h" | 13 #include "src/heap/incremental-marking-inl.h" |
| 14 #include "src/heap/mark-compact.h" | 14 #include "src/heap/mark-compact.h" |
| 15 #include "src/heap/spaces-inl.h" | 15 #include "src/heap/spaces-inl.h" |
| 16 #include "src/heap/store-buffer.h" | 16 #include "src/heap/store-buffer.h" |
| 17 #include "src/heap/store-buffer-inl.h" | 17 #include "src/heap/store-buffer-inl.h" |
| 18 #include "src/isolate.h" | 18 #include "src/isolate.h" |
| 19 #include "src/list-inl.h" | 19 #include "src/list-inl.h" |
| 20 #include "src/log.h" | 20 #include "src/log.h" |
| 21 #include "src/msan.h" | 21 #include "src/msan.h" |
| 22 #include "src/objects-inl.h" | 22 #include "src/objects-inl.h" |
| 23 #include "src/type-feedback-vector-inl.h" | 23 #include "src/type-feedback-vector-inl.h" |
| 24 | 24 |
| 25 namespace v8 { | 25 namespace v8 { |
| 26 namespace internal { | 26 namespace internal { |
| 27 | 27 |
| 28 void PromotionQueue::insert(HeapObject* target, intptr_t size) { | 28 void PromotionQueue::insert(HeapObject* target, int32_t size, |
| 29 bool was_marked_black) { |
| 29 if (emergency_stack_ != NULL) { | 30 if (emergency_stack_ != NULL) { |
| 30 emergency_stack_->Add(Entry(target, size)); | 31 emergency_stack_->Add(Entry(target, size, was_marked_black)); |
| 31 return; | 32 return; |
| 32 } | 33 } |
| 33 | 34 |
| 34 if ((rear_ - 1) < limit_) { | 35 if ((rear_ - 1) < limit_) { |
| 35 RelocateQueueHead(); | 36 RelocateQueueHead(); |
| 36 emergency_stack_->Add(Entry(target, size)); | 37 emergency_stack_->Add(Entry(target, size, was_marked_black)); |
| 37 return; | 38 return; |
| 38 } | 39 } |
| 39 | 40 |
| 40 struct Entry* entry = reinterpret_cast<struct Entry*>(--rear_); | 41 struct Entry* entry = reinterpret_cast<struct Entry*>(--rear_); |
| 41 entry->obj_ = target; | 42 entry->obj_ = target; |
| 42 entry->size_ = size; | 43 entry->size_ = size; |
| 44 entry->was_marked_black_ = was_marked_black; |
| 43 | 45 |
| 44 // Assert no overflow into live objects. | 46 // Assert no overflow into live objects. |
| 45 #ifdef DEBUG | 47 #ifdef DEBUG |
| 46 SemiSpace::AssertValidRange(target->GetIsolate()->heap()->new_space()->top(), | 48 SemiSpace::AssertValidRange(target->GetIsolate()->heap()->new_space()->top(), |
| 47 reinterpret_cast<Address>(rear_)); | 49 reinterpret_cast<Address>(rear_)); |
| 48 #endif | 50 #endif |
| 49 } | 51 } |
| 50 | 52 |
| 51 | 53 |
| 52 #define ROOT_ACCESSOR(type, name, camel_name) \ | 54 #define ROOT_ACCESSOR(type, name, camel_name) \ |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 735 | 737 |
| 736 void VerifySmisVisitor::VisitPointers(Object** start, Object** end) { | 738 void VerifySmisVisitor::VisitPointers(Object** start, Object** end) { |
| 737 for (Object** current = start; current < end; current++) { | 739 for (Object** current = start; current < end; current++) { |
| 738 CHECK((*current)->IsSmi()); | 740 CHECK((*current)->IsSmi()); |
| 739 } | 741 } |
| 740 } | 742 } |
| 741 } // namespace internal | 743 } // namespace internal |
| 742 } // namespace v8 | 744 } // namespace v8 |
| 743 | 745 |
| 744 #endif // V8_HEAP_HEAP_INL_H_ | 746 #endif // V8_HEAP_HEAP_INL_H_ |
| OLD | NEW |