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

Unified Diff: Source/platform/heap/Heap.cpp

Issue 556443003: Oilpan: Fix ASan instrumentation around heap object headers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/heap/Heap.h ('k') | Source/wtf/Atomics.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/heap/Heap.cpp
diff --git a/Source/platform/heap/Heap.cpp b/Source/platform/heap/Heap.cpp
index 3b593341fb132806be33f8dc7cc3c43f01df7149..ee40e0e47ef93c9ab459c433c2fb9cc5988f360d 100644
--- a/Source/platform/heap/Heap.cpp
+++ b/Source/platform/heap/Heap.cpp
@@ -412,14 +412,11 @@ private:
bool m_parkedAllThreads; // False if we fail to park all threads
};
+NO_SANITIZE_ADDRESS
bool HeapObjectHeader::isMarked() const
{
checkHeader();
- // We need to unpoison/poison the header on ASAN since
- // acquireLoad doesn't have the NO_SANITIZE_ADDRESS flag.
- ASAN_UNPOISON_MEMORY_REGION(this, sizeof(this));
- unsigned size = acquireLoad(&m_size);
- ASAN_POISON_MEMORY_REGION(this, sizeof(this));
+ unsigned size = asanUnsafeAcquireLoad(&m_size);
return size & markBitMask;
}
« no previous file with comments | « Source/platform/heap/Heap.h ('k') | Source/wtf/Atomics.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698