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

Unified Diff: runtime/vm/gc_marker.cc

Issue 896133003: Fix Dartium DEBUG failures by ensuring proper scoping within GC prologue/epilogue. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 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 | runtime/vm/scavenger.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/gc_marker.cc
===================================================================
--- runtime/vm/gc_marker.cc (revision 43532)
+++ runtime/vm/gc_marker.cc (working copy)
@@ -501,19 +501,23 @@
bool invoke_api_callbacks,
bool collect_code) {
const bool visit_function_code = !collect_code;
- MarkingStack marking_stack;
Prologue(isolate, invoke_api_callbacks);
- MarkingVisitor mark(
- isolate, heap_, page_space, &marking_stack, visit_function_code);
- IterateRoots(isolate, &mark, !invoke_api_callbacks);
- DrainMarkingStack(isolate, &mark);
- IterateWeakReferences(isolate, &mark);
- MarkingWeakVisitor mark_weak;
- IterateWeakRoots(isolate, &mark_weak, invoke_api_callbacks);
- mark.Finalize();
- ProcessWeakTables(page_space);
- ProcessObjectIdTable(isolate);
-
+ // The API prologue/epilogue may create/destroy zones, so we must not
+ // depend on zone allocations surviving beyond the epilogue callback.
+ {
+ StackZone zone(isolate);
+ MarkingStack marking_stack;
+ MarkingVisitor mark(
+ isolate, heap_, page_space, &marking_stack, visit_function_code);
+ IterateRoots(isolate, &mark, !invoke_api_callbacks);
+ DrainMarkingStack(isolate, &mark);
+ IterateWeakReferences(isolate, &mark);
+ MarkingWeakVisitor mark_weak;
+ IterateWeakRoots(isolate, &mark_weak, invoke_api_callbacks);
+ mark.Finalize();
+ ProcessWeakTables(page_space);
+ ProcessObjectIdTable(isolate);
+ }
Epilogue(isolate, invoke_api_callbacks);
}
« no previous file with comments | « no previous file | runtime/vm/scavenger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698