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

Unified Diff: runtime/vm/flow_graph_builder.cc

Issue 773183002: Enable inlining inside try-blocks in the VM's optimizing compiler. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years 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_builder.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/flow_graph_builder.cc
===================================================================
--- runtime/vm/flow_graph_builder.cc (revision 42083)
+++ runtime/vm/flow_graph_builder.cc (working copy)
@@ -339,7 +339,8 @@
Definition* InlineExitCollector::JoinReturns(BlockEntryInstr** exit_block,
- Instruction** last_instruction) {
+ Instruction** last_instruction,
+ intptr_t try_index) {
// First sort the list of exits by block id (caching return instruction
// block entries as a side effect).
SortExits();
@@ -355,7 +356,7 @@
intptr_t join_id = caller_graph_->max_block_id() + 1;
caller_graph_->set_max_block_id(join_id);
JoinEntryInstr* join =
- new(I) JoinEntryInstr(join_id, CatchClauseNode::kInvalidTryIndex);
+ new(I) JoinEntryInstr(join_id, try_index);
join->InheritDeoptTargetAfter(isolate(), call_);
// The dominator set of the join is the intersection of the dominator
@@ -485,7 +486,8 @@
} else {
Definition* callee_result = JoinReturns(&callee_exit,
- &callee_last_instruction);
+ &callee_last_instruction,
+ call_block->try_index());
if (callee_result != NULL) {
call_->ReplaceUsesWith(callee_result);
}
« no previous file with comments | « runtime/vm/flow_graph_builder.h ('k') | runtime/vm/flow_graph_compiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698