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

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

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 | « no previous file | Source/platform/heap/HeapTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/heap/Heap.cpp
diff --git a/Source/platform/heap/Heap.cpp b/Source/platform/heap/Heap.cpp
index b5a83c52067a3b29b2328cbd3d8cae6bcb49f3b6..31bf0fe1f7aefa2f65a75283f10b080acda2a9ed 100644
--- a/Source/platform/heap/Heap.cpp
+++ b/Source/platform/heap/Heap.cpp
@@ -2297,8 +2297,8 @@ void Heap::collectGarbage(ThreadState::StackState stackState, ThreadState::GCTyp
ThreadState::NoAllocationScope noAllocationScope(state);
preGC();
- StackFrameDepth::configureStackLimit();
- ASSERT(StackFrameDepth::isSafeToRecurse());
+
+ StackFrameDepthScope stackDepthScope;
size_t totalObjectSize = Heap::allocatedObjectSize() + Heap::markedObjectSize();
Heap::resetHeapCounters();
@@ -2358,8 +2358,7 @@ void Heap::collectGarbageForTerminatingThread(ThreadState* state)
ThreadState::NoAllocationScope noAllocationScope(state);
state->preGC();
- StackFrameDepth::configureStackLimit();
- ASSERT(StackFrameDepth::isSafeToRecurse());
+ StackFrameDepthScope stackDepthScope;
// 1. Trace the thread local persistent roots. For thread local GCs we
// don't trace the stack (ie. no conservative scanning) since this is
« no previous file with comments | « no previous file | Source/platform/heap/HeapTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698