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

Unified Diff: runtime/vm/flow_graph_compiler_arm.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.cc ('k') | runtime/vm/flow_graph_compiler_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_arm.cc
diff --git a/runtime/vm/flow_graph_compiler_arm.cc b/runtime/vm/flow_graph_compiler_arm.cc
index 38db33babff5bd415b81ffbf660db5669788dc2d..0b7fd3d71624f7781be06fc5ae2e8982ff1f5e7e 100644
--- a/runtime/vm/flow_graph_compiler_arm.cc
+++ b/runtime/vm/flow_graph_compiler_arm.cc
@@ -1127,15 +1127,16 @@ 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.
for (intptr_t i = 0;
i < CallPattern::DeoptCallPatternLengthInInstructions();
++i) {
__ nop();
}
- lazy_deopt_pc_offset_ = assembler()->CodeSize();
- __ Branch(*StubCode::DeoptimizeLazy_entry());
+ lazy_deopt_return_pc_offset_ = assembler()->CodeSize();
+ __ Branch(*StubCode::DeoptimizeLazyFromReturn_entry());
+ lazy_deopt_throw_pc_offset_ = assembler()->CodeSize();
+ __ Branch(*StubCode::DeoptimizeLazyFromThrow_entry());
}
EndCodeSourceRange(TokenPosition::kDartCodeEpilogue);
}
« no previous file with comments | « runtime/vm/flow_graph_compiler.cc ('k') | runtime/vm/flow_graph_compiler_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698