Moved InstantiateTypeArgumentsComp and InstanceOfComp.

runtime/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 303 matching lines @@
     ASSERT(instantiator_type_arguments != NULL);
     ASSERT(!dst_type.IsNull());
     ASSERT(!dst_name.IsNull());
     inputs_[0] = value;
     inputs_[1] = instantiator;
     inputs_[2] = instantiator_type_arguments;
   }
 
   DECLARE_COMPUTATION(AssertAssignable)
 
-  intptr_t token_index() const { return token_index_; }
-  intptr_t try_index() const { return try_index_; }
   Value* value() const { return inputs_[0]; }
   Value* instantiator() const { return inputs_[1]; }
   Value* instantiator_type_arguments() const { return inputs_[2]; }
+
+  intptr_t token_index() const { return token_index_; }
+  intptr_t try_index() const { return try_index_; }
   const AbstractType& dst_type() const { return dst_type_; }
   const String& dst_name() const { return dst_name_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
  private:
   const intptr_t token_index_;
   const intptr_t try_index_;
   const AbstractType& dst_type_;
   const String& dst_name_;
@@ skipping 511 matching lines @@
 
   DECLARE_COMPUTATION(BooleanNegate)
 
   Value* value() const { return inputs_[0]; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BooleanNegateComp);
 };
 
 
-class InstanceOfComp : public Computation {
+class InstanceOfComp : public TemplateComputation<3> {
  public:
   InstanceOfComp(intptr_t token_index,
                  intptr_t try_index,
                  Value* value,
-                 Value* instantiator,  // Can be NULL.
-                 Value* type_arguments,  // Can be NULL.
+                 Value* instantiator,
+                 Value* instantiator_type_arguments,
                  const AbstractType& type,
                  bool negate_result)
       : token_index_(token_index),
         try_index_(try_index),
-        value_(value),
-        instantiator_(instantiator),
-        type_arguments_(type_arguments),
         type_(type),
         negate_result_(negate_result) {
-    ASSERT(value_ != NULL);
+    ASSERT(value != NULL);
+    ASSERT(instantiator != NULL);
+    ASSERT(instantiator_type_arguments != NULL);
     ASSERT(!type.IsNull());
+    inputs_[0] = value;
+    inputs_[1] = instantiator;
+    inputs_[2] = instantiator_type_arguments;
   }
 
   DECLARE_COMPUTATION(InstanceOf)
 
-  Value* value() const { return value_; }
-  Value* instantiator() const { return instantiator_; }
-  Value* type_arguments() const { return type_arguments_; }
+  Value* value() const { return inputs_[0]; }
+  Value* instantiator() const { return inputs_[1]; }
+  Value* instantiator_type_arguments() const { return inputs_[2]; }
+
   bool negate_result() const { return negate_result_; }
   const AbstractType& type() const { return type_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
 
-  virtual intptr_t InputCount() const;
-  virtual Value* InputAt(intptr_t i) const {
-    if (i == 0) return value();
-    if (i == 1) return type_arguments();
-    return NULL;
-  }
-
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
  private:
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* value_;
   Value* instantiator_;
   Value* type_arguments_;
   const AbstractType& type_;
   const bool negate_result_;
@@ skipping 988 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_