Restructure instance setter and finish the last 1/3 of increment instance field optimization.

runtime/vm/opt_code_generator_ia32.h

 // Copyright (c) 2011, 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_OPT_CODE_GENERATOR_IA32_H_
 #define VM_OPT_CODE_GENERATOR_IA32_H_
 
 #ifndef VM_OPT_CODE_GENERATOR_H_
 #error Do not include opt_code_generator_ia32.h; use opt_code_generator.h.
 #endif
@@ skipping 50 matching lines @@
                                             Register reg1,
                                             Register reg2);
   DeoptimizationBlob* AddDeoptimizationBlob(AstNode* node,
                                             Register reg1,
                                             Register reg2,
                                             Register reg3);
 
   void IntrinsifyGetter();
   void IntrinsifySetter();
 
-  bool ICDataToSameInlineableInstanceGetter(const ICData& ic_data);
   void InlineInstanceGettersWithSameTarget(AstNode* node,
+                                           intptr_t id,
                                            AstNode* receiver,
                                            const String& field_name,
                                            Register recv_reg);
+  void InlineInstanceSettersWithSameTarget(AstNode* node,
+                                           intptr_t id,
+                                           AstNode* receiver,
+                                           const String& field_name,
+                                           Register recv_reg,
+                                           Register value_reg);
 
   // Helper method to load a value quickly into register instead of pushing
   // and popping it.
   void VisitLoadOne(AstNode* node, Register reg);
   void VisitLoadTwo(AstNode* left,
                     AstNode* right,
                     Register left_reg,
                     Register right_reg);
 
-  bool IsInlineableInstanceGetter(const Function& function);
   void InlineInstanceGetter(AstNode* node,
                             intptr_t id,
                             AstNode* receiver,
                             const String& field_name,
                             Register recv_reg);
+  void InlineInstanceSetter(AstNode* node,
+                            intptr_t id,
+                            AstNode* receiver,
+                            const String& field_name,
+                            Register recv_reg,
+                            Register value_reg);
 
   void CallDeoptimize(intptr_t node_id, intptr_t token_index);
 
   void GenerateSmiBinaryOp(BinaryOpNode* node);
   void GenerateSmiShiftBinaryOp(BinaryOpNode* node);
 
   void GenerateDoubleBinaryOp(BinaryOpNode* node);
   void GenerateMintBinaryOp(BinaryOpNode* node, bool allow_smi);
   void CheckIfDoubleOrSmi(Register reg,
                           Register temp,
@@ skipping 15 matching lines @@
   bool GenerateDoubleComparison(ComparisonNode* node);
   bool GenerateEqualityComparison(ComparisonNode* node);
   void GenerateLogicalBinaryOp(BinaryOpNode* node);
   void GenerateConditionalJumps(const CodeGenInfo& nInfo, Condition condition);
   bool TryInlineInstanceCall(InstanceCallNode* node);
   bool TryInlineStaticCall(StaticCallNode* node);
 
   bool IsResultInEaxRequested(AstNode* node) const;
   bool NodeMayBeSmi(AstNode* node) const;
 
-  void PrintCollectedClasses(AstNode* node);
+  void PrintCollectedClassesAtId(AstNode* node, intptr_t id);
   void TraceOpt(AstNode* node, const char* message);
   void TraceNotOpt(AstNode* node, const char* message);
 
   GrowableArray<DeoptimizationBlob*> deoptimization_blobs_;
   const Class& smi_class_;
   const Class& double_class_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(OptimizingCodeGenerator);
 };
 
 }  // namespace dart
 
 
 #endif  // VM_OPT_CODE_GENERATOR_IA32_H_