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

Unified Diff: runtime/vm/isolate.cc

Issue 2741553002: Do not rely on code patching on DBC for lazy deoptimization. (Closed)
Patch Set: Cleanups 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
Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index b473061aadc884ff94fc990da3ccb0d03c245284..33fbc0468dcd660e6ebdac0524ea7c2f5162e8bd 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -1945,14 +1945,15 @@ uword Isolate::FindPendingDeopt(uword fp) const {
return (*pending_deopts_)[i].pc();
}
}
- FATAL("Missing pending deopt entry");
+ FATAL1("Missing pending deopt entry for fp=%" Pp "", fp);
return 0;
}
void Isolate::ClearPendingDeoptsAtOrBelow(uword fp) const {
for (intptr_t i = pending_deopts_->length() - 1; i >= 0; i--) {
- if ((*pending_deopts_)[i].fp() <= fp) {
+ uword deopt_fp = (*pending_deopts_)[i].fp();
+ if (fp == deopt_fp || IsCalleeFrameOf(fp, deopt_fp)) {
rmacnak 2017/03/09 20:31:59 (fp == deopt_fp)
pending_deopts_->RemoveAt(i);
}
}

Powered by Google App Engine
This is Rietveld 408576698