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

Unified Diff: runtime/vm/exceptions.cc

Issue 2523053002: Implement rewind: drop one or more frames from the debugger. (Closed)
Patch Set: code review Created 4 years, 1 month 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/exceptions.h ('k') | runtime/vm/flow_graph_compiler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/exceptions.cc
diff --git a/runtime/vm/exceptions.cc b/runtime/vm/exceptions.cc
index 71eb55aea03a9da9e539aa88bd832ee55d6c3105..560de5541be987a7166129c491c33907ff5e0b4c 100644
--- a/runtime/vm/exceptions.cc
+++ b/runtime/vm/exceptions.cc
@@ -189,7 +189,6 @@ static bool FindExceptionHandler(Thread* thread,
static void FindErrorHandler(uword* handler_pc,
uword* handler_sp,
uword* handler_fp) {
- // TODO(turnidge): Is there a faster way to get the next entry frame?
StackFrameIterator frames(StackFrameIterator::kDontValidateFrames);
StackFrame* frame = frames.NextFrame();
ASSERT(frame != NULL);
@@ -228,7 +227,17 @@ static uword RemapExceptionPCForDeopt(Thread* thread,
break;
}
}
+ }
+#endif // !DBC
+ return program_counter;
+}
+
+static void ClearLazyDeopts(Thread* thread, uword frame_pointer) {
+#if !defined(TARGET_ARCH_DBC)
+ MallocGrowableArray<PendingLazyDeopt>* pending_deopts =
+ thread->isolate()->pending_deopts();
+ if (pending_deopts->length() > 0) {
// We may be jumping over frames scheduled for lazy deopt. Remove these
// frames from the pending deopt table, but only after unmarking them so
// any stack walk that happens before the stack is unwound will still work.
@@ -264,7 +273,6 @@ static uword RemapExceptionPCForDeopt(Thread* thread,
#endif
}
#endif // !DBC
- return program_counter;
}
@@ -281,14 +289,18 @@ static void JumpToExceptionHandler(Thread* thread,
thread->set_resume_pc(remapped_pc);
uword run_exception_pc = StubCode::RunExceptionHandler_entry()->EntryPoint();
Exceptions::JumpToFrame(thread, run_exception_pc, stack_pointer,
- frame_pointer);
+ frame_pointer, false /* do not clear deopt */);
}
void Exceptions::JumpToFrame(Thread* thread,
uword program_counter,
uword stack_pointer,
- uword frame_pointer) {
+ uword frame_pointer,
+ bool clear_deopt_at_target) {
+ uword fp_for_clearing =
+ (clear_deopt_at_target ? frame_pointer + 1 : frame_pointer);
+ ClearLazyDeopts(thread, fp_for_clearing);
#if defined(USING_SIMULATOR)
// Unwinding of the C++ frames and destroying of their stack resources is done
// by the simulator, because the target stack_pointer is a simulated stack
« no previous file with comments | « runtime/vm/exceptions.h ('k') | runtime/vm/flow_graph_compiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698