Use explicit push-argument for InstanceSetter instruction.

vm/intermediate_language.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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 1041 matching lines @@
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
   ObjectKind receiver_type_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreIndexedComp);
 };
 
 
-// Not simply an InstanceCall because it has somewhat more complicated
-// semantics: the value operand is preserved before the call.
-class InstanceSetterComp : public TemplateComputation<2> {
+// TODO(fschneider): Make this an instance call.
+class InstanceSetterComp : public Computation {
  public:
   InstanceSetterComp(intptr_t token_pos,
                      intptr_t try_index,
                      const String& field_name,
-                     Value* receiver,
-                     Value* value)
+                     ZoneGrowableArray<PushArgumentInstr*>* arguments)

[srdjan, 2012/08/01 16:53:31]

It is OK that way, but I wonder why not pass explicitly two arguments. Is it in
preparation for converting it to instance call?

[Florian Schneider, 2012/08/02 10:06:59]

As part of introducing push-argument instructions I'm making all call-like
instructions have a uniform structure. I'd like to convert it to an instance
call as a separate CL.

       : token_pos_(token_pos),
         try_index_(try_index),
-        field_name_(field_name) {
-    inputs_[0] = receiver;
-    inputs_[1] = value;
-  }
+        field_name_(field_name),
+        arguments_(arguments) { }
 
-  DECLARE_COMPUTATION(InstanceSetter)
+  DECLARE_CALL_COMPUTATION(InstanceSetter)
 
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
   const String& field_name() const { return field_name_; }
-  Value* receiver() const { return inputs_[0]; }
-  Value* value() const { return inputs_[1]; }
+
+  intptr_t ArgumentCount() const { return arguments_->length(); }
+  PushArgumentInstr* ArgumentAt(intptr_t index) const {
+    return (*arguments_)[index];
+  }
 
   virtual bool CanDeoptimize() const { return true; }
 
+  virtual void PrintOperandsTo(BufferFormatter* f) const;
+
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
   const String& field_name_;
+  ZoneGrowableArray<PushArgumentInstr*>* arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceSetterComp);
 };
 
 
 // Not simply a StaticCall because it has somewhat more complicated
 // semantics: the value operand is preserved before the call.
 class StaticSetterComp : public TemplateComputation<1> {
  public:
   StaticSetterComp(intptr_t token_pos,
@@ skipping 1536 matching lines @@
   // Parallel move that will be used by linear scan register allocator to
   // connect live ranges at the end of the block and resolve phis.
   ParallelMoveInstr* parallel_move_;
 };
 
 
 class BranchInstr : public InstructionWithInputs {
  public:
   BranchInstr(intptr_t token_pos,
               intptr_t try_index,
-               Value* left,
-             Value* right,
+              Value* left,
+              Value* right,
               Token::Kind kind)
       : InstructionWithInputs(),
         token_pos_(token_pos),
         try_index_(try_index),
         left_(left),
         right_(right),
         kind_(kind),
         true_successor_(NULL),
         false_successor_(NULL) {
     ASSERT(left_ != NULL);
@@ skipping 135 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_