Chromium Code Reviews| Index: src/heap/mark-compact.h |
| diff --git a/src/heap/mark-compact.h b/src/heap/mark-compact.h |
| index 254748174fdfd3f1c1210b9bd8345f1b01c3c71a..5a0d1a89efe6faffdc667eeab30ebf15b8fc89b8 100644 |
| --- a/src/heap/mark-compact.h |
| +++ b/src/heap/mark-compact.h |
| @@ -47,59 +47,71 @@ class ObjectMarking : public AllStatic { |
| return Marking::Color(ObjectMarking::MarkBitFrom<mode>(obj)); |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
|
Michael Lippautz
2017/03/06 13:52:54
nit: Can you spell out the names, e.g. modication_
ulan
2017/03/06 14:51:33
+1, how about calling the parameter AccessMode?
Hannes Payer (out of office)
2017/03/08 14:12:57
Done.
Hannes Payer (out of office)
2017/03/08 14:12:57
Done.
|
| + MarkingMode mode = MarkingMode::FULL> |
| V8_INLINE static bool IsImpossible(HeapObject* obj) { |
| - return Marking::IsImpossible(MarkBitFrom<mode>(obj)); |
| + return Marking::IsImpossible<mod_mode>(MarkBitFrom<mode>(obj)); |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| + MarkingMode mode = MarkingMode::FULL> |
| V8_INLINE static bool IsBlack(HeapObject* obj) { |
| - return Marking::IsBlack(MarkBitFrom<mode>(obj)); |
| + return Marking::IsBlack<mod_mode>(MarkBitFrom<mode>(obj)); |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| + MarkingMode mode = MarkingMode::FULL> |
| V8_INLINE static bool IsWhite(HeapObject* obj) { |
| - return Marking::IsWhite(MarkBitFrom<mode>(obj)); |
| + return Marking::IsWhite<mod_mode>(MarkBitFrom<mode>(obj)); |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| + MarkingMode mode = MarkingMode::FULL> |
| V8_INLINE static bool IsGrey(HeapObject* obj) { |
| - return Marking::IsGrey(MarkBitFrom<mode>(obj)); |
| + return Marking::IsGrey<mod_mode>(MarkBitFrom<mode>(obj)); |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| + MarkingMode mode = MarkingMode::FULL> |
| V8_INLINE static bool IsBlackOrGrey(HeapObject* obj) { |
| - return Marking::IsBlackOrGrey(MarkBitFrom<mode>(obj)); |
| + return Marking::IsBlackOrGrey<mod_mode>(MarkBitFrom<mode>(obj)); |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| - V8_INLINE static void BlackToGrey(HeapObject* obj) { |
| - DCHECK(IsBlack<mode>(obj)); |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| + MarkingMode mode = MarkingMode::FULL> |
| + V8_INLINE static bool BlackToGrey(HeapObject* obj) { |
| + DCHECK((IsBlack<mod_mode, mode>(obj))); |
| MarkBit markbit = MarkBitFrom<mode>(obj); |
| - Marking::BlackToGrey(markbit); |
| + if (!Marking::BlackToGrey<mod_mode>(markbit)) return false; |
| MemoryChunk::IncrementLiveBytes<mode>(obj, -obj->Size()); |
| + return true; |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| - V8_INLINE static void WhiteToGrey(HeapObject* obj) { |
| - DCHECK(IsWhite<mode>(obj)); |
| - Marking::WhiteToGrey(MarkBitFrom<mode>(obj)); |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| + MarkingMode mode = MarkingMode::FULL> |
| + V8_INLINE static bool WhiteToGrey(HeapObject* obj) { |
| + DCHECK((IsWhite<mod_mode, mode>(obj))); |
| + return Marking::WhiteToGrey<mod_mode>(MarkBitFrom<mode>(obj)); |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| - V8_INLINE static void WhiteToBlack(HeapObject* obj) { |
| - DCHECK(IsWhite<mode>(obj)); |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| + MarkingMode mode = MarkingMode::FULL> |
| + V8_INLINE static bool WhiteToBlack(HeapObject* obj) { |
| + DCHECK((IsWhite<mod_mode, mode>(obj))); |
| MarkBit markbit = MarkBitFrom<mode>(obj); |
| - Marking::WhiteToBlack(markbit); |
| + if (!Marking::WhiteToBlack<mod_mode>(markbit)) return false; |
| MemoryChunk::IncrementLiveBytes<mode>(obj, obj->Size()); |
| + return true; |
| } |
| - template <MarkingMode mode = MarkingMode::FULL> |
| - V8_INLINE static void GreyToBlack(HeapObject* obj) { |
| - DCHECK(IsGrey<mode>(obj)); |
| + template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| + MarkingMode mode = MarkingMode::FULL> |
| + V8_INLINE static bool GreyToBlack(HeapObject* obj) { |
| + DCHECK((IsGrey<mod_mode, mode>(obj))); |
| MarkBit markbit = MarkBitFrom<mode>(obj); |
| - Marking::GreyToBlack(markbit); |
| + if (!Marking::GreyToBlack<mod_mode>(markbit)) return false; |
| MemoryChunk::IncrementLiveBytes<mode>(obj, obj->Size()); |
| + return true; |
| } |
| private: |