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

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: rasd 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') | no next file with comments »
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 3de4593c509835435b0b947070b505cf25202c48..6674d94567fa46d2c1348f8afcc37f6888f4ea2a 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -1101,15 +1101,14 @@ 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();
- // Unit tests use the reload context later. Caller is responsible
- // for deleting the context.
+ reload_context_->Reload(force_reload);
+ bool success = !reload_context_->reload_aborted();
if (!dont_delete_reload_context) {
DeleteReloadContext();
}
#if defined(DEBUG)
if (success) {
+ return success;
Thread* thread = Thread::Current();
Isolate* isolate = thread->isolate();
isolate->heap()->CollectAllGarbage();
@@ -1131,7 +1130,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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698