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

Unified Diff: runtime/vm/isolate_reload.cc

Issue 2759933005: Fix recent reload flakes (Closed)
Patch Set: Created 3 years, 9 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/service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/isolate_reload.cc
diff --git a/runtime/vm/isolate_reload.cc b/runtime/vm/isolate_reload.cc
index 14d9d7ab6c202334989121846146c6afcedf57a6..75050dcdfb9e078c2abf1f117d58bce921fdedfe 100644
--- a/runtime/vm/isolate_reload.cc
+++ b/runtime/vm/isolate_reload.cc
@@ -634,6 +634,9 @@ void IsolateReloadContext::Reload(bool force_reload,
// WEIRD CONTROL FLOW ENDS.
TIR_Print("---- EXITED TAG HANDLER\n");
+ // Re-enable the background compiler. Do this before propagating any errors.
+ BackgroundCompiler::Enable();
+
if (result.IsUnwindError()) {
if (thread->top_exit_frame_info() == 0) {
// We can only propagate errors when there are Dart frames on the stack.
@@ -724,8 +727,6 @@ void IsolateReloadContext::FinalizeFailedLoad(const Error& error) {
void IsolateReloadContext::CommonFinalizeTail() {
ReportOnJSON(js_);
reload_finalized_ = true;
- // As a final step, re-enable the background compiler.
- BackgroundCompiler::Enable();
}
« no previous file with comments | « no previous file | runtime/vm/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698