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

Unified Diff: Source/wtf/LinkedHashSet.h

Issue 1145073002: Move AddressSanitizer.h to wtf/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix non-Oilpan compilation 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
« no previous file with comments | « Source/wtf/Atomics.h ('k') | Source/wtf/wtf.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/LinkedHashSet.h
diff --git a/Source/wtf/LinkedHashSet.h b/Source/wtf/LinkedHashSet.h
index d8342e2316c47f42703dd4613331bd80b11b66fe..4f6feed876a60a9a13de861ba2a74f2aaae504a7 100644
--- a/Source/wtf/LinkedHashSet.h
+++ b/Source/wtf/LinkedHashSet.h
@@ -22,22 +22,12 @@
#ifndef WTF_LinkedHashSet_h
#define WTF_LinkedHashSet_h
+#include "wtf/AddressSanitizer.h"
#include "wtf/DefaultAllocator.h"
#include "wtf/HashSet.h"
#include "wtf/OwnPtr.h"
#include "wtf/PassOwnPtr.h"
-// TODO(sof): See NO_SANITIZE_ADDRESS comment in platform/heap/AddressSanitizer.h
-// on the Windows toolchain special case; that comment also covers why we
-// temporarily need this NO_LAZY_SWEEP_SANITIZE_ADDRESS_WTF annotation.
-// (macro repeatedly defined here so as to avoid introducing an improper
-// wtf/ => platform/ dependency.)
-#if defined(ADDRESS_SANITIZER) && ENABLE(OILPAN) && (!OS(WIN) || COMPILER(CLANG))
-#define NO_LAZY_SWEEP_SANITIZE_ADDRESS_WTF __attribute__((no_sanitize_address))
-#else
-#define NO_LAZY_SWEEP_SANITIZE_ADDRESS_WTF
-#endif
-
namespace WTF {
// LinkedHashSet: Just like HashSet, this class provides a Set
@@ -64,7 +54,7 @@ class LinkedHashSetNodeBase {
public:
LinkedHashSetNodeBase() : m_prev(this), m_next(this) { }
- NO_LAZY_SWEEP_SANITIZE_ADDRESS_WTF
+ NO_LAZY_SWEEP_SANITIZE_ADDRESS
void unlink()
{
if (!m_next)
« no previous file with comments | « Source/wtf/Atomics.h ('k') | Source/wtf/wtf.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698