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

Unified Diff: Source/platform/Timer.h

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.h
diff --git a/Source/platform/Timer.h b/Source/platform/Timer.h
index e8015b6d5ca0cc4461b54fde74fad7fd1251f1a4..30cc5a3e9e4737f0bcbf33f549ddf65f41791738 100644
--- a/Source/platform/Timer.h
+++ b/Source/platform/Timer.h
@@ -27,6 +27,7 @@
#define Timer_h
#include "platform/PlatformExport.h"
+#include "platform/heap/AddressSanitizer.h"
#include "platform/heap/Handle.h"
#include "public/platform/WebTraceLocation.h"
#include "wtf/Noncopyable.h"
@@ -72,6 +73,7 @@ public:
private:
virtual void fired() = 0;
+ NO_LAZY_SWEEP_SANITIZE_ADDRESS
virtual double alignedFireTime(double fireTime) const { return fireTime; }
void checkConsistency() const;
@@ -79,6 +81,7 @@ private:
void setNextFireTime(double);
+ NO_LAZY_SWEEP_SANITIZE_ADDRESS
bool inHeap() const { return m_heapIndex != -1; }
bool hasValidHeapPosition() const;
@@ -92,6 +95,7 @@ private:
void heapPop();
void heapPopMin();
+ NO_LAZY_SWEEP_SANITIZE_ADDRESS
Vector<TimerBase*>& timerHeap() const { ASSERT(m_cachedThreadGlobalTimerHeap); return *m_cachedThreadGlobalTimerHeap; }
double m_nextFireTime; // 0 if inactive
@@ -154,6 +158,7 @@ private:
TimerFiredFunction m_function;
};
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
inline bool TimerBase::isActive() const
{
ASSERT(m_thread == currentThread());

Powered by Google App Engine
This is Rietveld 408576698