| Index: Source/heap/Visitor.cpp
|
| diff --git a/Source/heap/Visitor.cpp b/Source/heap/Visitor.cpp
|
| index 608dbc70d82974a2bcf7f512e771162f0882bae4..2df85759e024d154934a461ebcfef1b7d850b5b1 100644
|
| --- a/Source/heap/Visitor.cpp
|
| +++ b/Source/heap/Visitor.cpp
|
| @@ -37,21 +37,20 @@
|
| namespace WebCore {
|
|
|
| #ifndef NDEBUG
|
| -void Visitor::checkTypeMarker(const void* payload, const char* marker)
|
| +void Visitor::checkGCInfo(const void* payload, const GCInfo* gcInfo)
|
| {
|
| FinalizedHeapObjectHeader::fromPayload(payload)->checkHeader();
|
| - ASSERT(FinalizedHeapObjectHeader::fromPayload(payload)->typeMarker() == marker);
|
| + ASSERT(FinalizedHeapObjectHeader::fromPayload(payload)->gcInfo() == gcInfo);
|
| }
|
|
|
| #define DEFINE_VISITOR_CHECK_MARKER(Type) \
|
| - void Visitor::checkTypeMarker(const Type* payload, const char* marker) \
|
| + void Visitor::checkGCInfo(const Type* payload, const GCInfo* gcInfo) \
|
| { \
|
| HeapObjectHeader::fromPayload(payload)->checkHeader(); \
|
| Type* object = const_cast<Type*>(payload); \
|
| Address addr = pageHeaderAddress(reinterpret_cast<Address>(object)); \
|
| BaseHeapPage* page = reinterpret_cast<BaseHeapPage*>(addr); \
|
| - ASSERT(page->gcInfo()); \
|
| - ASSERT(page->gcInfo()->m_typeMarker == marker); \
|
| + ASSERT(page->gcInfo() == gcInfo); \
|
| }
|
|
|
| FOR_EACH_TYPED_HEAP(DEFINE_VISITOR_CHECK_MARKER)
|
| @@ -60,7 +59,6 @@ FOR_EACH_TYPED_HEAP(DEFINE_VISITOR_CHECK_MARKER)
|
|
|
| #define DEFINE_DO_NOTHING_TRAIT(type) \
|
| const GCInfo GCInfoTrait<type>::info = { \
|
| - #type, \
|
| doNothingTrace, \
|
| 0, /* no finalizer method */ \
|
| false \
|
|
|