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

Unified Diff: Source/platform/Timer.cpp

Issue 1120943002: Various ASan exemptions to allow Oilpan pre-sweep poisoning of unmarkeds. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased Created 5 years, 7 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
Index: Source/platform/Timer.cpp
diff --git a/Source/platform/Timer.cpp b/Source/platform/Timer.cpp
index 6a2111200a0957f6e6af3c7fda62a2a966ecb9ce..4d03435531e54270dc7453ec9db995db22beef5e 100644
--- a/Source/platform/Timer.cpp
+++ b/Source/platform/Timer.cpp
@@ -29,6 +29,7 @@
#include "platform/PlatformThreadData.h"
#include "platform/ThreadTimers.h"
+#include "platform/heap/AddressSanitizer.h"
#include "wtf/Atomics.h"
#include "wtf/CurrentTime.h"
#include "wtf/HashSet.h"
@@ -77,6 +78,7 @@ inline TimerHeapReference TimerHeapPointer::operator*() const
return *m_pointer;
}
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
inline TimerHeapReference& TimerHeapReference::operator=(TimerBase* timer)
{
m_reference = timer;
@@ -86,6 +88,7 @@ inline TimerHeapReference& TimerHeapReference::operator=(TimerBase* timer)
return *this;
}
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
inline TimerHeapReference& TimerHeapReference::operator=(TimerHeapReference b)
{
TimerBase* timer = b;
@@ -168,6 +171,7 @@ public:
bool operator()(const TimerBase*, const TimerBase*) const;
};
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
inline bool TimerHeapLessThanFunction::operator()(const TimerBase* a, const TimerBase* b) const
{
// The comparisons below are "backwards" because the heap puts the largest
@@ -290,6 +294,7 @@ inline void TimerBase::heapInsert()
heapDecreaseKey();
}
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
inline void TimerBase::heapPop()
{
// Temporarily force this timer to have the minimum key so we can pop it.

Powered by Google App Engine
This is Rietveld 408576698