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

Unified Diff: Source/wtf/Deque.h

Issue 1025623002: Disable inline vector buffers for WTF::Deque for ASAN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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/wtf/Deque.h
diff --git a/Source/wtf/Deque.h b/Source/wtf/Deque.h
index 34b0fa542a646446e101aec8c2798c7105f0c995..d0c04a214b1736bbc5dc25beac5b1bf11d58b0e0 100644
--- a/Source/wtf/Deque.h
+++ b/Source/wtf/Deque.h
@@ -43,7 +43,7 @@ namespace WTF {
template<typename T, size_t inlineCapacity, typename Allocator> class DequeConstIterator;
template<typename T, size_t inlineCapacity = 0, typename Allocator = DefaultAllocator>
- class Deque : public ConditionalDestructor<Deque<T, inlineCapacity, Allocator>, (inlineCapacity == 0) && Allocator::isGarbageCollected> {
+ class Deque : public ConditionalDestructor<Deque<T, INLINE_CAPACITY, Allocator>, (INLINE_CAPACITY == 0) && Allocator::isGarbageCollected> {
WTF_USE_ALLOCATOR(Deque, Allocator);
public:
typedef DequeIterator<T, inlineCapacity, Allocator> iterator;
@@ -118,7 +118,7 @@ namespace WTF {
private:
friend class DequeIteratorBase<T, inlineCapacity, Allocator>;
- typedef VectorBuffer<T, inlineCapacity, Allocator> Buffer;
+ typedef VectorBuffer<T, INLINE_CAPACITY, Allocator> Buffer;
typedef VectorTypeOperations<T> TypeOperations;
typedef DequeIteratorBase<T, inlineCapacity, Allocator> IteratorBase;
@@ -272,7 +272,7 @@ namespace WTF {
template<typename T, size_t inlineCapacity, typename Allocator>
inline void Deque<T, inlineCapacity, Allocator>::finalize()
{
- if (!inlineCapacity && !m_buffer.buffer())
+ if (!INLINE_CAPACITY && !m_buffer.buffer())
return;
if (!isEmpty() && !(Allocator::isGarbageCollected && m_buffer.hasOutOfLineBuffer()))
destroyAll();
« 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