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

Unified Diff: runtime/vm/stack_frame.cc

Issue 10880079: Emit deoptimization information at static calls (preparation for full deoptimization). … (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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 | « runtime/vm/intermediate_language.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stack_frame.cc
===================================================================
--- runtime/vm/stack_frame.cc (revision 11464)
+++ runtime/vm/stack_frame.cc (working copy)
@@ -134,8 +134,10 @@
const PcDescriptors& descriptors =
PcDescriptors::Handle(code.pc_descriptors());
for (intptr_t i = 0; i < descriptors.Length(); i++) {
- if (static_cast<uword>(descriptors.PC(i)) == pc() &&
- descriptors.TryIndex(i) != -1) {
+ // TryIndex is invalid for PcDescriptors::kDeoptIndex.
+ if ((static_cast<uword>(descriptors.PC(i)) == pc()) &&
+ (descriptors.DescriptorKind(i) != PcDescriptors::kDeoptIndex) &&
+ (descriptors.TryIndex(i) != -1)) {
try_index = descriptors.TryIndex(i);
break;
}
« no previous file with comments | « runtime/vm/intermediate_language.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698