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

Unified Diff: Source/heap/Heap.h

Issue 204673002: Oilpan: Disable the GC_PLUGIN_IGNORE annotation when compiling with asan. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/heap/Heap.h
diff --git a/Source/heap/Heap.h b/Source/heap/Heap.h
index 5904f48118862b05c1ee4c1a71afef1eb368dbe4..75821fbe7c821025369c566ada3d1a3db206efe8 100644
--- a/Source/heap/Heap.h
+++ b/Source/heap/Heap.h
@@ -1046,10 +1046,10 @@ T* adoptRefCountedGarbageCollected(T* ptr)
// ignore a particular class or field when checking for proper usage. When using
// GC_PLUGIN_IGNORE a bug-number should be provided as an argument where the
// bug describes what needs to happen to remove the GC_PLUGIN_IGNORE again.
-#if COMPILER(CLANG)
-#define STACK_ALLOCATED() \
- private: \
- __attribute__((annotate("blink_stack_allocated"))) \
+#if COMPILER(CLANG) && !defined(ADDRESS_SANITIZER)
+#define STACK_ALLOCATED() \
+ private: \
+ __attribute__((annotate("blink_stack_allocated"))) \
void* operator new(size_t) = delete;
#define GC_PLUGIN_IGNORE(bug) \
__attribute__((annotate("blink_gc_plugin_ignore")))
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698