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

Unified Diff: Source/heap/ThreadState.cpp

Issue 152513006: Do not scan the active part of the stack in oilpan conservative garbage collections. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/heap/ThreadState.cpp
diff --git a/Source/heap/ThreadState.cpp b/Source/heap/ThreadState.cpp
index e955142c39f0b452b580234323b5db17d523d097..a1fcd110cc0dad1b9d5aeca802a67754ea360c98 100644
--- a/Source/heap/ThreadState.cpp
+++ b/Source/heap/ThreadState.cpp
@@ -310,8 +310,16 @@ void ThreadState::visitRoots(Visitor* visitor)
NO_SANITIZE_ADDRESS
void ThreadState::visitStack(Visitor* visitor)
{
- Address* end = reinterpret_cast<Address*>(m_startOfStack);
- for (Address* current = reinterpret_cast<Address*>(m_endOfStack); current < end; ++current) {
+ Address* start = reinterpret_cast<Address*>(m_startOfStack);
+ // If there is a safepoint scope marker we should stop the stack
+ // scanning there to not touch active parts of the stack. Anything
+ // interesting beyond that point is in the safepoint stack copy.
+ // If there is no scope marker the thread is blocked and we should
+ // scan all the way to the recorded end stack pointer.
+ Address* end = reinterpret_cast<Address*>(m_endOfStack);
+ Address* safePointScopeMarker = reinterpret_cast<Address*>(m_safePointScopeMarker);
+ Address* current = safePointScopeMarker ? safePointScopeMarker : end;
+ for (; current < start; ++current) {
Heap::checkAndMarkPointer(visitor, *current);
}
« 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