Some cleanups, started implementing checked instance calls, better equality operation.

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 18 matching lines @@
 // M is a two argument macro.  It is applied to each concrete instruction's
 // (including the values) typename and classname.
 #define FOR_EACH_COMPUTATION(M)                                                \
   FOR_EACH_VALUE(M)                                                            \
   M(AssertAssignable, AssertAssignableComp)                                    \
   M(AssertBoolean, AssertBooleanComp)                                          \
   M(CurrentContext, CurrentContextComp)                                        \
   M(StoreContext, StoreContextComp)                                            \
   M(ClosureCall, ClosureCallComp)                                              \
   M(InstanceCall, InstanceCallComp)                                            \
+  M(PolymorphicInstanceCall, PolymorphicInstanceCallComp)                      \
   M(StaticCall, StaticCallComp)                                                \
   M(LoadLocal, LoadLocalComp)                                                  \
   M(StoreLocal, StoreLocalComp)                                                \
   M(StrictCompare, StrictCompareComp)                                          \
   M(EqualityCompare, EqualityCompareComp)                                      \
   M(RelationalOp, RelationalOpComp)                                            \
   M(NativeCall, NativeCallComp)                                                \
   M(LoadIndexed, LoadIndexedComp)                                              \
   M(StoreIndexed, StoreIndexedComp)                                            \
   M(InstanceSetter, InstanceSetterComp)                                        \
@@ skipping 91 matching lines @@
   // Create a location summary for this computation.
   // TODO(fschneider): Temporarily returns NULL for instructions
   // that are not yet converted to the location based code generation.
   virtual LocationSummary* MakeLocationSummary() const = 0;
 
   // TODO(fschneider): Make EmitNativeCode and locs const.
   virtual void EmitNativeCode(FlowGraphCompiler* compiler) = 0;
 
   static LocationSummary* MakeCallSummary();
 
+  void ReplaceWith(Computation* other);
+
   // Declare an enum value used to define type-test predicates.
   enum ComputationType {
 #define DECLARE_COMPUTATION_TYPE(ShortName, ClassName) k##ShortName,
 
   FOR_EACH_COMPUTATION(DECLARE_COMPUTATION_TYPE)
 
 #undef DECLARE_COMPUTATION_TYPE
   };
 
   virtual ComputationType computation_type() const = 0;
@@ skipping 337 matching lines @@
   const intptr_t try_index_;
   const String& function_name_;
   ZoneGrowableArray<Value*>* const arguments_;
   const Array& argument_names_;
   const intptr_t checked_argument_count_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceCallComp);
 };
 
 
+class PolymorphicInstanceCallComp : public Computation {
+ public:
+  PolymorphicInstanceCallComp(InstanceCallComp* comp,
+                              const ZoneGrowableArray<intptr_t>& class_ids,
+                              const ZoneGrowableArray<Function*>& targets)
+      : instance_call_(comp),
+        class_ids_(class_ids),
+        targets_(targets) {
+    ASSERT(instance_call_ != NULL);
+  }
+
+  InstanceCallComp* instance_call() const { return instance_call_; }
+  const ZoneGrowableArray<intptr_t>& class_ids() const { return class_ids_; }
+  const ZoneGrowableArray<Function*>& targets() const { return targets_; }
+
+  virtual intptr_t InputCount() const { return instance_call()->InputCount(); }
+  virtual Value* InputAt(intptr_t i) const {
+    return instance_call()->ArgumentAt(i);
+  }
+
+  virtual void PrintOperandsTo(BufferFormatter* f) const {
+    instance_call()->PrintOperandsTo(f);
+  }
+
+  DECLARE_COMPUTATION(PolymorphicInstanceCall)
+
+ private:
+  InstanceCallComp* instance_call_;
+  const ZoneGrowableArray<intptr_t>& class_ids_;
+  const ZoneGrowableArray<Function*>& targets_;
+
+  DISALLOW_COPY_AND_ASSIGN(PolymorphicInstanceCallComp);
+};
+
+
 class ComparisonComp : public TemplateComputation<2> {
  public:
   ComparisonComp(Value* left, Value* right)
       : fused_with_branch_(NULL) {
     ASSERT(left != NULL);
     ASSERT(right != NULL);
     inputs_[0] = left;
     inputs_[1] = right;
   }
 
   void MarkFusedWithBranch(BranchInstr* branch) {
     fused_with_branch_ = branch;
   }
 
   BranchInstr* fused_with_branch() const {
+    ASSERT(is_fused_with_branch());
     return fused_with_branch_;
   }
 
   bool is_fused_with_branch() const {
     return fused_with_branch_ != NULL;
   }
 
   Value* left() const { return inputs_[0]; }
   Value* right() const { return inputs_[1]; }
 
@@ skipping 23 matching lines @@
 
 
 class EqualityCompareComp : public ComparisonComp {
  public:
   EqualityCompareComp(intptr_t token_index,
                       intptr_t try_index,
                       Value* left,
                       Value* right)
       : ComparisonComp(left, right),
         token_index_(token_index),
-        try_index_(try_index) {
+        try_index_(try_index),
+        operands_class_id_(kObject) {
   }
 
   DECLARE_COMPUTATION(EqualityCompare)
 
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
+  void set_operands_class_id(intptr_t value) {
+    operands_class_id_ = value;
+  }
+  intptr_t operands_class_id() const { return operands_class_id_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
  private:
   const intptr_t token_index_;
   const intptr_t try_index_;
+  intptr_t operands_class_id_;  // class id of both operands.
 
   DISALLOW_COPY_AND_ASSIGN(EqualityCompareComp);
 };
 
 
 class RelationalOpComp : public ComparisonComp {
  public:
   RelationalOpComp(intptr_t token_index,
                    intptr_t try_index,
                    Token::Kind kind,
@@ skipping 1727 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_