More ICData cleanups: try to use ICData instead of converting it to another intermediate representa…

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 538 matching lines @@
   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) {
+  explicit PolymorphicInstanceCallComp(InstanceCallComp* comp)
+      : instance_call_(comp) {
     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 SetInputAt(intptr_t index, Value* value) {
     instance_call()->SetInputAt(index, value);
   }
 
   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);
@@ skipping 44 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),
-        class_ids_(NULL),
-        targets_(NULL) {
+        try_index_(try_index) {
   }
 
   DECLARE_COMPUTATION(EqualityCompare)
 
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
-  void SetPolymorphicTargets(ZoneGrowableArray<intptr_t>* class_ids,
-                             ZoneGrowableArray<Function*>* targets) {
-    class_ids_ = class_ids;
-    targets_ = targets;
-    ASSERT(targets_ != NULL);
-    ASSERT(class_ids_ != NULL);
-  }
-  intptr_t NumTargets() const {
-    return class_ids_ == NULL ? 0 : class_ids_->length();
-  }
-  Function* TargetAt(intptr_t ix) const {
-    ASSERT(targets_ != NULL);
-    return (*targets_)[ix];
-  }
-  intptr_t ClassIdAt(intptr_t ix) const {
-    ASSERT(class_ids_ != NULL);
-    return (*class_ids_)[ix];
-  }
-
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
  private:
   const intptr_t token_index_;
   const intptr_t try_index_;
-  ZoneGrowableArray<intptr_t>* class_ids_;
-  ZoneGrowableArray<Function*>* targets_;
 
   DISALLOW_COPY_AND_ASSIGN(EqualityCompareComp);
 };
 
 
 class RelationalOpComp : public ComparisonComp {
  public:
   RelationalOpComp(intptr_t token_index,
                    intptr_t try_index,
                    Token::Kind kind,
@@ skipping 168 matching lines @@
   const intptr_t try_index_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeCallComp);
 };
 
 
 class LoadInstanceFieldComp : public TemplateComputation<1> {
  public:
   LoadInstanceFieldComp(const Field& field,
                         Value* instance,
-                        InstanceCallComp* original,  // Maybe NULL.
-                        ZoneGrowableArray<intptr_t>* class_ids)  // Maybe NULL.
-      : field_(field), original_(original), class_ids_(class_ids) {
+                        InstanceCallComp* original)  // Maybe NULL.
+      : field_(field), original_(original) {
     ASSERT(instance != NULL);
     inputs_[0] = instance;
   }
 
   DECLARE_COMPUTATION(LoadInstanceField)
 
   const Field& field() const { return field_; }
   Value* instance() const { return inputs_[0]; }
-  const ZoneGrowableArray<intptr_t>* class_ids() const { return class_ids_; }
   const InstanceCallComp* original() const { return original_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
  private:
   const Field& field_;
   const InstanceCallComp* original_;  // For optimizations.
-  // If non-NULL, the instruction is valid only for the class ids listed.
-  const ZoneGrowableArray<intptr_t>* class_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadInstanceFieldComp);
 };
 
 
 class StoreInstanceFieldComp : public TemplateComputation<2> {
  public:
   StoreInstanceFieldComp(const Field& field,
                          Value* instance,
                          Value* value,
-                         InstanceSetterComp* original,  // Maybe NULL.
-                         ZoneGrowableArray<intptr_t>* class_ids)  // Maybe NULL.
-      : field_(field), original_(original), class_ids_(class_ids) {
+                         InstanceSetterComp* original)  // Maybe NULL.
+      : field_(field), original_(original) {
     ASSERT(instance != NULL);
     ASSERT(value != NULL);
     inputs_[0] = instance;
     inputs_[1] = value;
   }
 
   DECLARE_COMPUTATION(StoreInstanceField)
 
   const Field& field() const { return field_; }
 
   Value* instance() const { return inputs_[0]; }
   Value* value() const { return inputs_[1]; }
 
-  const ZoneGrowableArray<intptr_t>* class_ids() const { return class_ids_; }
   const InstanceSetterComp* original() const { return original_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
  private:
   const Field& field_;
   const InstanceSetterComp* original_;  // For optimizations.
-  // If non-NULL, the instruction is valid only for the class ids listed.
-  const ZoneGrowableArray<intptr_t>* class_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreInstanceFieldComp);
 };
 
 
 class LoadStaticFieldComp : public TemplateComputation<0> {
  public:
   explicit LoadStaticFieldComp(const Field& field) : field_(field) {}
 
   DECLARE_COMPUTATION(LoadStaticField);
@@ skipping 379 matching lines @@
 };
 
 
 class LoadVMFieldComp : public TemplateComputation<1> {
  public:
   LoadVMFieldComp(Value* value,
                   intptr_t offset_in_bytes,
                   const AbstractType& type)
       : offset_in_bytes_(offset_in_bytes),
         type_(type),
-        original_(NULL),
-        class_ids_(NULL) {
+        original_(NULL) {
     ASSERT(value != NULL);
     ASSERT(type.IsZoneHandle());  // May be null if field is not an instance.
     inputs_[0] = value;
   }
 
-  LoadVMFieldComp(Value* value,
-                  intptr_t offset_in_bytes,
-                  const AbstractType& type,
-                  InstanceCallComp* original,
-                  ZoneGrowableArray<intptr_t>* class_ids)
-      : offset_in_bytes_(offset_in_bytes),
-        type_(type),
-        original_(original),
-        class_ids_(class_ids) {
-    ASSERT(value != NULL);
-    ASSERT(type.IsZoneHandle());  // May be null if field is not an instance.
-    ASSERT(original != NULL);
-    ASSERT(class_ids != NULL);
-    inputs_[0] = value;
-  }
-
   DECLARE_COMPUTATION(LoadVMField)
 
   Value* value() const { return inputs_[0]; }
   intptr_t offset_in_bytes() const { return offset_in_bytes_; }
   const AbstractType& type() const { return type_; }
-  const ZoneGrowableArray<intptr_t>* class_ids() const { return class_ids_; }
   const InstanceCallComp* original() const { return original_; }
+  void set_original(InstanceCallComp* value) { original_ = value; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
  private:
   const intptr_t offset_in_bytes_;
   const AbstractType& type_;
   const InstanceCallComp* original_;  // For optimizations.
   // If non-NULL, the instruction is valid only for the class ids listed.
-  const ZoneGrowableArray<intptr_t>* class_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadVMFieldComp);
 };
 
 
 class StoreVMFieldComp : public TemplateComputation<2> {
  public:
   StoreVMFieldComp(Value* dest,
                    intptr_t offset_in_bytes,
                    Value* value,
@@ skipping 1067 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_