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

Unified Diff: runtime/vm/flow_graph_compiler_dbc.cc

Issue 2388093003: VM: Make optimized try-catch work in DBC. (Closed)
Patch Set: new test file Created 4 years, 2 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/flow_graph_compiler_dbc.cc
diff --git a/runtime/vm/flow_graph_compiler_dbc.cc b/runtime/vm/flow_graph_compiler_dbc.cc
index 2b1763eaa1e370191cd0070c6fb8bcef9ad73c13..9f0aee9d0c7830be6eaada6076e2a4632c8f5983 100644
--- a/runtime/vm/flow_graph_compiler_dbc.cc
+++ b/runtime/vm/flow_graph_compiler_dbc.cc
@@ -194,10 +194,12 @@ void FlowGraphCompiler::RecordAfterCall(Instruction* instr) {
// hence the difference.
pending_deoptimization_env_->DropArguments(instr->ArgumentCount());
AddDeoptIndexAtCall(deopt_id_after);
+ // This descriptor is needed for exception handling in optimized code.
+ AddCurrentDescriptor(RawPcDescriptors::kOther,
+ deopt_id_after, instr->token_pos());
} else {
// Add deoptimization continuation point after the call and before the
// arguments are removed.
- // In optimized code this descriptor is needed for exception handling.
AddCurrentDescriptor(RawPcDescriptors::kDeopt,
deopt_id_after,
instr->token_pos());

Powered by Google App Engine
This is Rietveld 408576698