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

Unified Diff: runtime/vm/pages.cc

Issue 1965823002: Initial isolate reload support (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 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
Index: runtime/vm/pages.cc
diff --git a/runtime/vm/pages.cc b/runtime/vm/pages.cc
index 64b1d5e91f7d342c85cc9622fba2cd1d72c9db40..c9346f8e1216c6e24d573709ea1e7c106284f7e7 100644
--- a/runtime/vm/pages.cc
+++ b/runtime/vm/pages.cc
@@ -846,7 +846,9 @@ void PageSpace::MarkSweep(bool invoke_api_callbacks) {
SpaceUsage usage_before = GetCurrentUsage();
// Mark all reachable old-gen objects.
- bool collect_code = FLAG_collect_code && ShouldCollectCode();
+ bool collect_code = FLAG_collect_code &&
+ ShouldCollectCode() &&
+ !isolate->HasAttemptedReload();
GCMarker marker(heap_);
marker.MarkObjects(isolate, this, invoke_api_callbacks, collect_code);
usage_.used_in_words = marker.marked_words();

Powered by Google App Engine
This is Rietveld 408576698