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

Unified Diff: runtime/vm/flow_graph_compiler_x64.cc

Issue 2374273002: Fix a throw returning to a frame marked for lazy deopt that captures the stacktrace. (Closed)
Patch Set: . Created 4 years, 3 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/flow_graph_compiler_mips.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_x64.cc
diff --git a/runtime/vm/flow_graph_compiler_x64.cc b/runtime/vm/flow_graph_compiler_x64.cc
index 0c0444a78f7d3e158af077157c3c5a22202a4991..67223b5dbb0edc298a8da24cbc50a35bd6750d46 100644
--- a/runtime/vm/flow_graph_compiler_x64.cc
+++ b/runtime/vm/flow_graph_compiler_x64.cc
@@ -1140,11 +1140,12 @@ void FlowGraphCompiler::CompileGraph() {
BeginCodeSourceRange();
if (is_optimizing() && !FLAG_precompiled_mode) {
- // Leave enough space for patching in case of lazy deoptimization from
- // deferred code.
+ // Leave enough space for patching in case of lazy deoptimization.
__ nop(ShortCallPattern::pattern_length_in_bytes());
- lazy_deopt_pc_offset_ = assembler()->CodeSize();
- __ Jmp(*StubCode::DeoptimizeLazy_entry(), PP);
+ lazy_deopt_return_pc_offset_ = assembler()->CodeSize();
+ __ Jmp(*StubCode::DeoptimizeLazyFromReturn_entry(), PP);
+ lazy_deopt_throw_pc_offset_ = assembler()->CodeSize();
+ __ Jmp(*StubCode::DeoptimizeLazyFromThrow_entry(), PP);
}
EndCodeSourceRange(TokenPosition::kDartCodeEpilogue);
}
« no previous file with comments | « runtime/vm/flow_graph_compiler_mips.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698