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

Unified Diff: runtime/vm/isolate.cc

Issue 2201093002: Make all reload zone allocations use the same zone (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 4 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/isolate_reload.h » ('j') | runtime/vm/isolate_reload.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index c743fae446206b5c287d138a331ff82cb42b8794..58a46ed48f0c425c99851102b8dde7d5d3efff76 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -1102,8 +1102,8 @@ bool Isolate::ReloadSources(JSONStream* js,
ASSERT(!IsReloading());
has_attempted_reload_ = true;
reload_context_ = new IsolateReloadContext(this, js);
- reload_context_->StartReload(force_reload);
- bool success = !reload_context_->has_error();
+ reload_context_->Reload(force_reload);
+ bool success = !reload_context_->reload_aborted();
// TODO(asiva): Add verification of canonical objects.
if (dont_delete_reload_context) {
// Unit tests use the reload context later. Caller is responsible
@@ -1125,7 +1125,7 @@ void Isolate::DeleteReloadContext() {
void Isolate::DoneFinalizing() {
NOT_IN_PRODUCT(
if (IsReloading()) {
- reload_context_->FinishReload();
+ reload_context_->FinalizeLoading();
}
)
}
« no previous file with comments | « no previous file | runtime/vm/isolate_reload.h » ('j') | runtime/vm/isolate_reload.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698