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

Unified Diff: Source/platform/heap/TraceTraits.h

Issue 1125613002: Oilpan: handle thread-local weak tracing slightly better. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: compile fix 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
Index: Source/platform/heap/TraceTraits.h
diff --git a/Source/platform/heap/TraceTraits.h b/Source/platform/heap/TraceTraits.h
index a463dd925857759346f065bac41b2bc2d5fa755f..b6a1e51d44e8e1d3a8739cad608ce94e00575922 100644
--- a/Source/platform/heap/TraceTraits.h
+++ b/Source/platform/heap/TraceTraits.h
@@ -56,7 +56,7 @@ public:
// enabled so as to avoid testing against a much lower & too low,
// stack depth threshold.
#if !defined(ADDRESS_SANITIZER)
- ASSERT(StackFrameDepth::isSafeToRecurse());
+ ASSERT(StackFrameDepth::isSafeToRecurse() || !StackFrameDepth::isActive());
#endif
if (LIKELY(StackFrameDepth::isSafeToRecurse())) {
if (visitor->ensureMarked(t)) {
« Source/platform/heap/StackFrameDepth.h ('K') | « Source/platform/heap/StackFrameDepth.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698