Oilpan: more lazy sweep ASan exemptions.
Annotate the Timer methods called upon by sharedTimerFiredInternal()
as exempted by ASan checks also.
TBR=haraken
BUG=420515
Review URL: https://codereview.chromium.org/1148943003
git-svn-id: svn://svn.chromium.org/blink/trunk@195656 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/third_party/WebKit/Source/platform/Timer.cpp b/third_party/WebKit/Source/platform/Timer.cpp
index 4d03435..b5eeff8 100644
--- a/third_party/WebKit/Source/platform/Timer.cpp
+++ b/third_party/WebKit/Source/platform/Timer.cpp
@@ -127,6 +127,7 @@
TimerBase* operator->() const { return *m_pointer; }
private:
+ NO_LAZY_SWEEP_SANITIZE_ADDRESS
void checkConsistency(ptrdiff_t offset = 0) const
{
ASSERT(m_pointer >= threadGlobalTimerHeap().data());
@@ -237,6 +238,7 @@
return m_nextFireTime - current;
}
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
inline void TimerBase::checkHeapIndex() const
{
ASSERT(timerHeap() == threadGlobalTimerHeap());
@@ -263,6 +265,7 @@
checkHeapIndex();
}
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
inline void TimerBase::heapDelete()
{
ASSERT(m_nextFireTime == 0);
@@ -271,6 +274,7 @@
m_heapIndex = -1;
}
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
void TimerBase::heapDeleteMin()
{
ASSERT(m_nextFireTime == 0);
@@ -305,6 +309,7 @@
m_nextFireTime = fireTime;
}
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
void TimerBase::heapPopMin()
{
ASSERT(this == timerHeap().first());
@@ -368,6 +373,7 @@
ASSERT(!inHeap() || hasValidHeapPosition());
}
+NO_LAZY_SWEEP_SANITIZE_ADDRESS
void TimerBase::setNextFireTime(double newUnalignedTime)
{
ASSERT(m_thread == currentThread());
diff --git a/third_party/WebKit/Source/platform/Timer.h b/third_party/WebKit/Source/platform/Timer.h
index 30cc5a3e..549c43d 100644
--- a/third_party/WebKit/Source/platform/Timer.h
+++ b/third_party/WebKit/Source/platform/Timer.h
@@ -61,6 +61,7 @@
double nextFireInterval() const;
double nextUnalignedFireInterval() const;
+ NO_LAZY_SWEEP_SANITIZE_ADDRESS
double repeatInterval() const { return m_repeatInterval; }
void augmentRepeatInterval(double delta) {
