Enable inlining inside try-blocks in the VM's optimizing compiler.

runtime/vm/flow_graph_inliner.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_inliner.h"
 
 #include "vm/block_scheduler.h"
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
@@ skipping 573 matching lines @@
     }
   }
 
   bool TryInlining(const Function& function,
                    const Array& argument_names,
                    InlinedCallData* call_data) {
     TRACE_INLINING(OS::Print("  => %s (deopt count %d)\n",
                              function.ToCString(),
                              function.deoptimization_counter()));
 
-    // TODO(fschneider): Enable inlining inside try-blocks.
-    if (call_data->call->GetBlock()->try_index() !=
-        CatchClauseNode::kInvalidTryIndex) {
-      TRACE_INLINING(OS::Print("     Bailout: inside try-block\n"));
-      PRINT_INLINING_TREE("Inside try-block",
-          &call_data->caller, &function, call_data->call);
-      return false;
-    }
-
     // Make a handle for the unoptimized code so that it is not disconnected
     // from the function while we are trying to inline it.
     const Code& unoptimized_code = Code::Handle(function.unoptimized_code());
     // Abort if the inlinable bit on the function is low.
     if (!function.CanBeInlined()) {
       TRACE_INLINING(OS::Print("     Bailout: not inlinable\n"));
       PRINT_INLINING_TREE("Not inlinable",
           &call_data->caller, &function, call_data->call);
       return false;
     }
@@ skipping 110 matching lines @@
           PRINT_INLINING_TREE("Optional arg mismatch",
               &call_data->caller, &function, call_data->call);
           return false;
         }
       }
 
       // After treating optional parameters the actual/formal count must match.
       ASSERT(arguments->length() == function.NumParameters());
       ASSERT(param_stubs->length() == callee_graph->parameter_count());
 
+      // Update try-index of the callee graph.
+      BlockEntryInstr* call_block = call_data->call->GetBlock();
+      if (call_block->InsideTryBlock()) {
+        intptr_t try_index = call_block->try_index();
+        for (BlockIterator it = callee_graph->reverse_postorder_iterator();
+             !it.Done(); it.Advance()) {
+          BlockEntryInstr* block = it.Current();
+          block->set_try_index(try_index);
+        }
+      }
+
       BlockScheduler block_scheduler(callee_graph);
       block_scheduler.AssignEdgeWeights();
 
       {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphinliner_ssa_timer,
                          isolate());
         // Compute SSA on the callee graph, catching bailouts.
         callee_graph->ComputeSSA(caller_graph_->max_virtual_register_number(),
                                  param_stubs);
@@ skipping 1030 matching lines @@
         OS::Print("After Inlining of %s\n", flow_graph_->
                   parsed_function()->function().ToFullyQualifiedCString());
         FlowGraphPrinter printer(*flow_graph_);
         printer.PrintBlocks();
       }
     }
   }
 }
 
 }  // namespace dart