Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: Source/heap/Visitor.cpp

Issue 180533004: Oilpan: deprecate GCInfO::typeMarker and replace its checks w/ gcInfo ptr compare (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/heap/Visitor.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "heap/Visitor.h" 32 #include "heap/Visitor.h"
33 33
34 #include "heap/Handle.h" 34 #include "heap/Handle.h"
35 #include "heap/Heap.h" 35 #include "heap/Heap.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 #ifndef NDEBUG 39 #ifndef NDEBUG
40 void Visitor::checkTypeMarker(const void* payload, const char* marker) 40 void Visitor::checkGCInfo(const void* payload, const GCInfo* gcInfo)
41 { 41 {
42 FinalizedHeapObjectHeader::fromPayload(payload)->checkHeader(); 42 FinalizedHeapObjectHeader::fromPayload(payload)->checkHeader();
43 ASSERT(FinalizedHeapObjectHeader::fromPayload(payload)->typeMarker() == mark er); 43 ASSERT(FinalizedHeapObjectHeader::fromPayload(payload)->gcInfo() == gcInfo);
44 } 44 }
45 45
46 #define DEFINE_VISITOR_CHECK_MARKER(Type) \ 46 #define DEFINE_VISITOR_CHECK_MARKER(Type) \
47 void Visitor::checkTypeMarker(const Type* payload, const char* marker) \ 47 void Visitor::checkGCInfo(const Type* payload, const GCInfo* gcInfo) \
48 { \ 48 { \
49 HeapObjectHeader::fromPayload(payload)->checkHeader(); \ 49 HeapObjectHeader::fromPayload(payload)->checkHeader(); \
50 Type* object = const_cast<Type*>(payload); \ 50 Type* object = const_cast<Type*>(payload); \
51 Address addr = pageHeaderAddress(reinterpret_cast<Address>(object)); \ 51 Address addr = pageHeaderAddress(reinterpret_cast<Address>(object)); \
52 BaseHeapPage* page = reinterpret_cast<BaseHeapPage*>(addr); \ 52 BaseHeapPage* page = reinterpret_cast<BaseHeapPage*>(addr); \
53 ASSERT(page->gcInfo()); \ 53 ASSERT(page->gcInfo() == gcInfo); \
54 ASSERT(page->gcInfo()->m_typeMarker == marker); \
55 } 54 }
56 55
57 FOR_EACH_TYPED_HEAP(DEFINE_VISITOR_CHECK_MARKER) 56 FOR_EACH_TYPED_HEAP(DEFINE_VISITOR_CHECK_MARKER)
58 #undef DEFINE_VISITOR_CHECK_MARKER 57 #undef DEFINE_VISITOR_CHECK_MARKER
59 #endif 58 #endif
60 59
61 #define DEFINE_DO_NOTHING_TRAIT(type) \ 60 #define DEFINE_DO_NOTHING_TRAIT(type) \
62 const GCInfo GCInfoTrait<type>::info = { \ 61 const GCInfo GCInfoTrait<type>::info = { \
63 #type, \
64 doNothingTrace, \ 62 doNothingTrace, \
65 0, /* no finalizer method */ \ 63 0, /* no finalizer method */ \
66 false \ 64 false \
67 }; 65 };
68 66
69 ITERATE_DO_NOTHING_TYPES(DEFINE_DO_NOTHING_TRAIT) 67 ITERATE_DO_NOTHING_TYPES(DEFINE_DO_NOTHING_TRAIT)
70 68
71 } 69 }
OLDNEW
« no previous file with comments | « Source/heap/Visitor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698