Make CreateArrayComp a call by using explicit push-argument instructions.

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 1161 matching lines @@
   virtual bool CanDeoptimize() const { return false; }
 
  private:
   const ConstructorCallNode& ast_node_;
   const intptr_t try_index_;
   ZoneGrowableArray<Value*>* const arguments_;
   DISALLOW_COPY_AND_ASSIGN(AllocateObjectWithBoundsCheckComp);
 };
 
 
-class CreateArrayComp : public TemplateComputation<1> {
+class CreateArrayComp : public Computation {
  public:
   CreateArrayComp(intptr_t token_pos,
                   intptr_t try_index,
                   ZoneGrowableArray<Value*>* elements,
                   Value* element_type)
       : token_pos_(token_pos),
         try_index_(try_index),
         elements_(elements) {
 #if defined(DEBUG)
     for (int i = 0; i < ElementCount(); ++i) {
       ASSERT(ElementAt(i) != NULL);
     }
     ASSERT(element_type != NULL);
 #endif

[srdjan, 2012/08/06 16:31:25]

This CL causes crashes as element_type is never set

[Florian Schneider, 2012/08/07 08:56:18]

Oh, thanks. It worked because elements_type_ seems to be used only in
IL-printing. I have a CL that fixes this instruction (i.e. makes it a
TemplateComputation again, but make sure it is handled as a call so that SSA
code generation supports it)

-    inputs_[0] = element_type;
   }
 
-  DECLARE_COMPUTATION(CreateArray)
+  DECLARE_CALL_COMPUTATION(CreateArray)
+
+  virtual intptr_t ArgumentCount() const { return ElementCount() + 1; }
 
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
   intptr_t ElementCount() const { return elements_->length(); }
   Value* ElementAt(intptr_t i) const { return (*elements_)[i]; }
-  Value* element_type() const { return inputs_[0]; }
-
-  virtual intptr_t InputCount() const;
-  virtual Value* InputAt(intptr_t i) const;
-  virtual void SetInputAt(intptr_t i, Value* value);
+  Value* element_type() const { return element_type_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
   ZoneGrowableArray<Value*>* const elements_;
+  Value* element_type_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateArrayComp);
 };
 
 
 class CreateClosureComp : public Computation {
  public:
   CreateClosureComp(ClosureNode* node,
                     intptr_t try_index,
                     ZoneGrowableArray<PushArgumentInstr*>* arguments)
@@ skipping 1522 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_