Refactor and simplify manual inlining in the flow graph optimizer.

runtime/vm/flow_graph_optimizer.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_OPTIMIZER_H_
 #define VM_FLOW_GRAPH_OPTIMIZER_H_
 
 #include "vm/intermediate_language.h"
 #include "vm/flow_graph.h"
 
@@ skipping 63 matching lines @@
     flow_graph_->InsertBefore(next, instr, env, use_kind);
   }
 
  private:
   // Attempt to build ICData for call using propagated class-ids.
   bool TryCreateICData(InstanceCallInstr* call);
   const ICData& TrySpecializeICData(const ICData& ic_data, intptr_t cid);
 
   void SpecializePolymorphicInstanceCall(PolymorphicInstanceCallInstr* call);
 
-  bool TryReplaceWithStoreIndexed(InstanceCallInstr* call);
+  bool TryReplaceWithIndexedOp(InstanceCallInstr* call);
   bool InlineSetIndexed(MethodRecognizer::Kind kind,
                         const Function& target,
                         Instruction* call,
                         Definition* receiver,
                         intptr_t token_pos,
-                        const ICData* ic_data,
                         const ICData& value_check,
                         TargetEntryInstr** entry,
                         Definition** last);
-  bool TryReplaceWithLoadIndexed(InstanceCallInstr* call);
   bool InlineGetIndexed(MethodRecognizer::Kind kind,
                         Instruction* call,
                         Definition* receiver,
-                        const ICData& ic_data,
                         TargetEntryInstr** entry,
                         Definition** last);
   intptr_t PrepareInlineIndexedOp(Instruction* call,
                                   intptr_t array_cid,
                                   Definition** array,
                                   Definition* index,
                                   Instruction** cursor);
 
 
   bool TryReplaceWithBinaryOp(InstanceCallInstr* call, Token::Kind op_kind);
@@ skipping 318 matching lines @@
 // Optimize spill stores inside try-blocks by identifying values that always
 // contain a single known constant at catch block entry.
 class TryCatchAnalyzer : public AllStatic {
  public:
   static void Optimize(FlowGraph* flow_graph);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_OPTIMIZER_H_