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

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: rename some methods 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/platform/heap/StackFrameDepth.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/heap/TraceTraits.h
diff --git a/Source/platform/heap/TraceTraits.h b/Source/platform/heap/TraceTraits.h
index a463dd925857759346f065bac41b2bc2d5fa755f..580a59e3c5251d7d9c61bd56223eebf0100fe99a 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::isEnabled() || StackFrameDepth::isSafeToRecurse());
#endif
if (LIKELY(StackFrameDepth::isSafeToRecurse())) {
if (visitor->ensureMarked(t)) {
« no previous file with comments | « Source/platform/heap/StackFrameDepth.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698