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

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

Issue 1158243004: Fix nested parking of threads while setting up a garbage collection. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 | no next file » | 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 d1f421585fb0f096e10c0b5788c4f529fdfcdc4b..430e1121cd22fee3d4651aea19f3667277737c7f 100644
--- a/Source/platform/heap/Heap.cpp
+++ b/Source/platform/heap/Heap.cpp
@@ -1882,7 +1882,8 @@ void Heap::collectGarbage(ThreadState::StackState stackState, ThreadState::GCTyp
// the GC.
if (!gcScope.allThreadsParked()) {
// Restore the original GCState.
- state->setGCState(originalGCState);
+ if (LIKELY(state->gcState() == ThreadState::StoppingOtherThreads))
+ state->setGCState(originalGCState);
return;
}
« 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