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

Side by Side Diff: Source/platform/heap/HeapPage.cpp

Issue 1321173002: Oilpan: fix building with blink_gc_profiling:1 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | Source/platform/heap/ThreadState.cpp » ('j') | 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #define ASAN_RETIRE_CONTAINER_ANNOTATION(payload, payloadSize) 94 #define ASAN_RETIRE_CONTAINER_ANNOTATION(payload, payloadSize)
95 #define ASAN_MARK_LARGE_VECTOR_CONTAINER(heap, largeObject) 95 #define ASAN_MARK_LARGE_VECTOR_CONTAINER(heap, largeObject)
96 #endif 96 #endif
97 97
98 namespace blink { 98 namespace blink {
99 99
100 #if ENABLE(GC_PROFILING) 100 #if ENABLE(GC_PROFILING)
101 static String classOf(const void* object) 101 static String classOf(const void* object)
102 { 102 {
103 if (const GCInfo* gcInfo = Heap::findGCInfo(reinterpret_cast<Address>(const_ cast<void*>(object)))) 103 if (const GCInfo* gcInfo = Heap::findGCInfo(reinterpret_cast<Address>(const_ cast<void*>(object))))
104 return gcInfo->m_className; 104 return gcInfo->className();
105 return "unknown"; 105 return "unknown";
106 } 106 }
107 #endif 107 #endif
108 108
109 #if ENABLE(ASSERT) 109 #if ENABLE(ASSERT)
110 NO_SANITIZE_ADDRESS 110 NO_SANITIZE_ADDRESS
111 void HeapObjectHeader::zapMagic() 111 void HeapObjectHeader::zapMagic()
112 { 112 {
113 ASSERT(checkHeader()); 113 ASSERT(checkHeader());
114 m_magic = zappedMagic; 114 m_magic = zappedMagic;
(...skipping 1703 matching lines...) Expand 10 before | Expand all | Expand 10 after
1818 1818
1819 m_hasEntries = true; 1819 m_hasEntries = true;
1820 size_t index = hash(address); 1820 size_t index = hash(address);
1821 ASSERT(!(index & 1)); 1821 ASSERT(!(index & 1));
1822 Address cachePage = roundToBlinkPageStart(address); 1822 Address cachePage = roundToBlinkPageStart(address);
1823 m_entries[index + 1] = m_entries[index]; 1823 m_entries[index + 1] = m_entries[index];
1824 m_entries[index] = cachePage; 1824 m_entries[index] = cachePage;
1825 } 1825 }
1826 1826
1827 } // namespace blink 1827 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/platform/heap/ThreadState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698