VM(RegExp): Allow OSR optimization of RegExp :matcher functions.

runtime/vm/flow_graph_builder.cc

 // Copyright (c) 2012, 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_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/compiler.h"
@@ skipping 4453 matching lines @@
   EffectGraphVisitor for_effect(this);
   parsed_function().node_sequence()->Visit(&for_effect);
   AppendFragment(normal_entry, for_effect);
   // Check that the graph is properly terminated.
   ASSERT(!for_effect.is_open());
 
   // When compiling for OSR, use a depth first search to prune instructions
   // unreachable from the OSR entry. Catch entries are always considered
   // reachable, even if they become unreachable after OSR.
   if (osr_id_ != Compiler::kNoOSRDeoptId) {
-    PruneUnreachable();
+    graph_entry_->PruneUnreachableForOSR(Z, last_used_block_id_);
   }
 
   FlowGraph* graph =
       new (Z) FlowGraph(parsed_function(), graph_entry_, last_used_block_id_);
   graph->set_await_token_positions(await_token_positions_);
   return graph;
 }
 
 
 void FlowGraphBuilder::AppendAwaitTokenPosition(TokenPosition token_pos) {
   await_token_positions_->Add(token_pos);
 }
 
 
-void FlowGraphBuilder::PruneUnreachable() {
-  ASSERT(osr_id_ != Compiler::kNoOSRDeoptId);
-  BitVector* block_marks = new (Z) BitVector(Z, last_used_block_id_ + 1);
-  bool found =
-      graph_entry_->PruneUnreachable(graph_entry_, NULL, osr_id_, block_marks);
-  ASSERT(found);
-}
-
-
 void FlowGraphBuilder::Bailout(const char* reason) const {
   parsed_function_.Bailout("FlowGraphBuilder", reason);
 }
 
 
 bool FlowGraphBuilder::SimpleInstanceOfType(const AbstractType& type) {
   // Bail if the type is still uninstantiated at compile time.
   if (!type.IsInstantiated()) return false;
 
   // Bail if the type is a function or a Dart Function type.
   if (type.IsFunctionType() || type.IsDartFunctionType()) return false;
 
   ASSERT(type.HasResolvedTypeClass());
   const Class& type_class = Class::Handle(type.type_class());
   // Bail if the type has any type parameters.
   if (type_class.IsGeneric()) return false;
 
   // Finally a simple class for instance of checking.
   return true;
 }
 
 }  // namespace dart