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

Unified Diff: Source/platform/heap/HeapTest.cpp

Issue 1092223002: Oilpan: fix HeapVectorShrinkInlineCapacity test with ASan enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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/platform/heap/HeapTest.cpp
diff --git a/Source/platform/heap/HeapTest.cpp b/Source/platform/heap/HeapTest.cpp
index a4d92460d4c166dc772752d565872253cfa38ec7..4a49e3f563190878d03108612acc7255a378eb6e 100644
--- a/Source/platform/heap/HeapTest.cpp
+++ b/Source/platform/heap/HeapTest.cpp
@@ -2339,6 +2339,11 @@ TEST(HeapTest, HeapVectorShrinkInlineCapacity)
vector1.shrinkToFit();
EXPECT_GT(128u, vector1.capacity());
+ // TODO(sof): if the ASan support for 'contiguous containers' is enabled,
+ // Vector inline buffers are disabled; that constraint should be attempted
+ // removed, but until that time, disable testing handling of capacities
+ // of inline buffers.
+#if !defined(ANNOTATE_CONTIGUOUS_CONTAINER)
// Shrinking switches the buffer from the external one to the inline one.
vector1.shrink(inlineCapacity - 1);
vector1.shrinkToFit();
@@ -2348,6 +2353,7 @@ TEST(HeapTest, HeapVectorShrinkInlineCapacity)
vector1.shrink(1);
vector1.shrinkToFit();
EXPECT_EQ(inlineCapacity, vector1.capacity());
+#endif
}
template<typename T, size_t inlineCapacity, typename U>
« 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