languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 17:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix recent reload flakes

Browse source 
BUG=
R=rmacnak@google.com

Review-Url: https://codereview.chromium.org/2759933005 .
This commit is contained in:
John McCutchan 2017-03-20 12:28:29 -07:00
parent 3e78da649e
commit d54c68f6ac
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
runtime/vm/isolate_reload.cc
View file

@ -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();
}

8
runtime/vm/service.cc
View file

@ -2543,9 +2543,11 @@ RawError* Service::MaybePause(Isolate* isolate, const Error& error) {
if (!isolate->IsPaused()) {
if (isolate->should_pause_post_service_request()) {
isolate->set_should_pause_post_service_request(false);
// Before pausing, restore the sticky error. The debugger will return it
// from PausePostRequest.
Thread::Current()->set_sticky_error(error);
if (!error.IsNull()) {
// Before pausing, restore the sticky error. The debugger will return it
// from PausePostRequest.
Thread::Current()->set_sticky_error(error);
}
return isolate->PausePostRequest();
}
}