Only store IC data with instructions that collect type feedback.

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 111 matching lines @@
 class Value;
 
 
 enum Representation {
   kTagged, kUnboxedDouble
 };
 
 
 class Computation : public ZoneAllocated {
  public:
-  Computation() : deopt_id_(Isolate::kNoDeoptId), ic_data_(NULL), locs_(NULL) {
+  Computation() : deopt_id_(Isolate::kNoDeoptId), locs_(NULL) {
     Isolate* isolate = Isolate::Current();
     deopt_id_ = isolate->GetNextDeoptId();

[srdjan, 2012/08/30 18:53:21]

No need for variable isolate.

[Florian Schneider, 2012/09/03 10:33:29]

Done.

-    ic_data_ = isolate->GetICDataForDeoptId(deopt_id_);
   }
 
   // Unique id used for deoptimization.
   intptr_t deopt_id() const {
     ASSERT(CanDeoptimize());
     return deopt_id_;
   }
 
-  const ICData* ic_data() const { return ic_data_; }
-  void set_ic_data(const ICData* value) { ic_data_ = value; }
-  bool HasICData() const {
-    return (ic_data() != NULL) && !ic_data()->IsNull();
-  }
-
   // Visiting support.
   virtual void Accept(FlowGraphVisitor* visitor, BindInstr* instr) = 0;
 
   virtual intptr_t InputCount() const = 0;
   virtual Value* InputAt(intptr_t i) const = 0;
   virtual void SetInputAt(intptr_t i, Value* value) = 0;
 
   // Call computations override this function and return the
   // number of pushed arguments.
   virtual intptr_t ArgumentCount() const = 0;
@@ skipping 90 matching lines @@
   inline bool Is##ShortName() const;                                           \
   inline const ClassName* As##ShortName() const;                               \
   inline ClassName* As##ShortName();
 FOR_EACH_COMPUTATION(DECLARE_PREDICATE)
 #undef DECLARE_PREDICATE
 
  private:
   friend class BranchInstr;
 
   intptr_t deopt_id_;
-  const ICData* ic_data_;
   LocationSummary* locs_;
 
   DISALLOW_COPY_AND_ASSIGN(Computation);
 };
 
 
 // An embedded container with N elements of type T.  Used (with partial
 // specialization for N=0) because embedded arrays cannot have size 0.
 template<typename T, intptr_t N>
 class EmbeddedArray {
@@ skipping 325 matching lines @@
 
 
 class InstanceCallComp : public TemplateComputation<0> {
  public:
   InstanceCallComp(intptr_t token_pos,
                    const String& function_name,
                    Token::Kind token_kind,
                    ZoneGrowableArray<PushArgumentInstr*>* arguments,
                    const Array& argument_names,
                    intptr_t checked_argument_count)
-      : token_pos_(token_pos),
+      : ic_data_(Isolate::Current()->GetICDataForDeoptId(deopt_id())),
+        token_pos_(token_pos),
         function_name_(function_name),
         token_kind_(token_kind),
         arguments_(arguments),
         argument_names_(argument_names),
         checked_argument_count_(checked_argument_count) {
     ASSERT(function_name.IsZoneHandle());
     ASSERT(!arguments->is_empty());
     ASSERT(argument_names.IsZoneHandle());
     ASSERT(Token::IsBinaryToken(token_kind) ||
            Token::IsUnaryToken(token_kind) ||
            Token::IsIndexOperator(token_kind) ||
            token_kind == Token::kGET ||
            token_kind == Token::kSET ||
            token_kind == Token::kILLEGAL);
   }
 
   DECLARE_CALL_COMPUTATION(InstanceCall)
 
+  const ICData* ic_data() const { return ic_data_; }
+  void set_ic_data(const ICData* value) { ic_data_ = value; }

[srdjan, 2012/08/30 18:53:21]

Is set_ic_data needed at all? (here and in places below).

[Florian Schneider, 2012/09/03 10:33:29]

Done.

+  bool HasICData() const {
+    return (ic_data() != NULL) && !ic_data()->IsNull();
+  }
+
   intptr_t token_pos() const { return token_pos_; }
   const String& function_name() const { return function_name_; }
   Token::Kind token_kind() const { return token_kind_; }
   virtual intptr_t ArgumentCount() const { return arguments_->length(); }
   PushArgumentInstr* ArgumentAt(intptr_t index) const {
     return (*arguments_)[index];
   }
   const Array& argument_names() const { return argument_names_; }
   intptr_t checked_argument_count() const { return checked_argument_count_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const { return kDynamicCid; }
 
  private:
+  const ICData* ic_data_;
   const intptr_t token_pos_;
   const String& function_name_;
   const Token::Kind token_kind_;  // Binary op, unary op, kGET or kILLEGAL.
   ZoneGrowableArray<PushArgumentInstr*>* const arguments_;
   const Array& argument_names_;
   const intptr_t checked_argument_count_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceCallComp);
 };
 
 
 class PolymorphicInstanceCallComp : public TemplateComputation<0> {
  public:
-  explicit PolymorphicInstanceCallComp(InstanceCallComp* comp, bool with_checks)
-      : instance_call_(comp), with_checks_(with_checks) {
+  explicit PolymorphicInstanceCallComp(InstanceCallComp* comp,

[srdjan, 2012/08/30 18:53:21]

Remove explicit

[Florian Schneider, 2012/09/03 10:33:29]

Done.

+                                       const ICData& ic_data,
+                                       bool with_checks)
+      : instance_call_(comp), ic_data_(ic_data), with_checks_(with_checks) {
     ASSERT(instance_call_ != NULL);
   }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
   bool with_checks() const { return with_checks_; }
 
   void PrintTo(BufferFormatter* f) const;
 
   virtual intptr_t ArgumentCount() const {
     return instance_call()->ArgumentCount();
   }
 
   DECLARE_CALL_COMPUTATION(PolymorphicInstanceCall)
 
+  const ICData& ic_data() const { return ic_data_; }
+
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const { return kDynamicCid; }
 
  private:
   InstanceCallComp* instance_call_;
+  const ICData& ic_data_;
   const bool with_checks_;
 
   DISALLOW_COPY_AND_ASSIGN(PolymorphicInstanceCallComp);
 };
 
 
 class ComparisonComp : public TemplateComputation<2> {
  public:
   ComparisonComp(Token::Kind kind, Value* left, Value* right) : kind_(kind) {
     ASSERT(left != NULL);
@@ skipping 39 matching lines @@
 };
 
 
 class EqualityCompareComp : public ComparisonComp {
  public:
   EqualityCompareComp(intptr_t token_pos,
                       Token::Kind kind,
                       Value* left,
                       Value* right)
       : ComparisonComp(kind, left, right),
+        ic_data_(Isolate::Current()->GetICDataForDeoptId(deopt_id())),
         token_pos_(token_pos),
         receiver_class_id_(kIllegalCid) {
     ASSERT((kind == Token::kEQ) || (kind == Token::kNE));
   }
 
   DECLARE_COMPUTATION(EqualityCompare)
 
+  const ICData* ic_data() const { return ic_data_; }
+  void set_ic_data(const ICData* value) { ic_data_ = value; }
+  bool HasICData() const {
+    return (ic_data() != NULL) && !ic_data()->IsNull();
+  }
+
   intptr_t token_pos() const { return token_pos_; }
 
   // Receiver class id is computed from collected ICData.
   void set_receiver_class_id(intptr_t value) { receiver_class_id_ = value; }
   intptr_t receiver_class_id() const { return receiver_class_id_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const;
 
   virtual void EmitBranchCode(FlowGraphCompiler* compiler,
                               BranchInstr* branch);
 
  private:
+  const ICData* ic_data_;
   const intptr_t token_pos_;
   intptr_t receiver_class_id_;  // Set by optimizer.
 
   DISALLOW_COPY_AND_ASSIGN(EqualityCompareComp);
 };
 
 
 class RelationalOpComp : public ComparisonComp {
  public:
   RelationalOpComp(intptr_t token_pos,
                    Token::Kind kind,
                    Value* left,
                    Value* right)
       : ComparisonComp(kind, left, right),
+        ic_data_(Isolate::Current()->GetICDataForDeoptId(deopt_id())),
         token_pos_(token_pos),
         operands_class_id_(kIllegalCid) {
     ASSERT(Token::IsRelationalOperator(kind));
   }
 
   DECLARE_COMPUTATION(RelationalOp)
 
+  const ICData* ic_data() const { return ic_data_; }
+  void set_ic_data(const ICData* value) { ic_data_ = value; }
+  bool HasICData() const {
+    return (ic_data() != NULL) && !ic_data()->IsNull();
+  }
+
   intptr_t token_pos() const { return token_pos_; }
 
   // TODO(srdjan): instead of class-id pass an enum that can differentiate
   // between boxed and unboxed doubles and integers.
   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;
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const;
 
   virtual void EmitBranchCode(FlowGraphCompiler* compiler,
                               BranchInstr* branch);
 
  private:
+  const ICData* ic_data_;
   const intptr_t token_pos_;
   intptr_t operands_class_id_;  // class id of both operands.
 
   DISALLOW_COPY_AND_ASSIGN(RelationalOpComp);
 };
 
 
 class StaticCallComp : public TemplateComputation<0> {
  public:
   StaticCallComp(intptr_t token_pos,
@@ skipping 893 matching lines @@
     inputs_[1] = right;
   }
 
   Value* left() const { return inputs_[0]; }
   Value* right() const { return inputs_[1]; }
 
   Token::Kind op_kind() const { return op_kind_; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
+  const ICData* ic_data() const { return instance_call()->ic_data(); }
+
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   DECLARE_COMPUTATION(BinarySmiOp)
 
   virtual bool CanDeoptimize() const;
 
   virtual intptr_t ResultCid() const;
 
  private:
   const Token::Kind op_kind_;
@@ skipping 17 matching lines @@
     inputs_[1] = right;
   }
 
   Value* left() const { return inputs_[0]; }
   Value* right() const { return inputs_[1]; }
 
   Token::Kind op_kind() const { return op_kind_; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
+  const ICData* ic_data() const { return instance_call()->ic_data(); }
+
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   DECLARE_COMPUTATION(BinaryMintOp)
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const;
 
  private:
   const Token::Kind op_kind_;
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(BinaryMintOpComp);
 };
 
 
 class BinaryDoubleOpComp : public TemplateComputation<0> {
  public:
   BinaryDoubleOpComp(Token::Kind op_kind, InstanceCallComp* instance_call)
       : op_kind_(op_kind), instance_call_(instance_call) { }
 
   Token::Kind op_kind() const { return op_kind_; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
+  const ICData* ic_data() const { return instance_call()->ic_data(); }
+
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   DECLARE_CALL_COMPUTATION(BinaryDoubleOp)
 
   virtual intptr_t ArgumentCount() const { return 2; }
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const;
 
  private:
@@ skipping 42 matching lines @@
   NumberNegateComp(InstanceCallComp* instance_call,
                    Value* value) : instance_call_(instance_call) {
     ASSERT(value != NULL);
     inputs_[0] = value;
   }
 
   Value* value() const { return inputs_[0]; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
+  const ICData* ic_data() const { return instance_call()->ic_data(); }
+
   DECLARE_COMPUTATION(NumberNegate)
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const { return kDoubleCid; }
 
  private:
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(NumberNegateComp);
 };
@@ skipping 58 matching lines @@
 
  private:
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(SmiToDoubleComp);
 };
 
 
 class CheckClassComp : public TemplateComputation<1> {
  public:
-  CheckClassComp(Value* value, InstanceCallComp* original)
-      : original_(original) {
+  CheckClassComp(Value* value,
+                 InstanceCallComp* instance_call,
+                 const ICData& unary_checks)
+      : instance_call_(instance_call),
+        unary_checks_(unary_checks) {
     ASSERT(value != NULL);
     inputs_[0] = value;
   }
 
   DECLARE_COMPUTATION(CheckClass)
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const { return kIllegalCid; }
 
   virtual bool AttributesEqual(Computation* other) const;
 
   virtual bool HasSideEffect() const { return false; }
 
   Value* value() const { return inputs_[0]; }
 
-  intptr_t deopt_id() const { return original_->deopt_id(); }
+  const ICData& unary_checks() const { return unary_checks_; }
+
+  intptr_t deopt_id() const { return instance_call_->deopt_id(); }
 
   virtual Definition* TryReplace(BindInstr* instr) const;
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
  private:
-  InstanceCallComp* original_;
+  InstanceCallComp* instance_call_;
+  const ICData& unary_checks_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckClassComp);
 };
 
 
 class CheckSmiComp : public TemplateComputation<1> {
  public:
-  CheckSmiComp(Value* value, InstanceCallComp* original)
-      : original_(original) {
+  CheckSmiComp(Value* value, InstanceCallComp* instance_call)
+      : instance_call_(instance_call) {
     ASSERT(value != NULL);
     inputs_[0] = value;
   }
 
   DECLARE_COMPUTATION(CheckSmi)
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const { return kIllegalCid; }
 
   virtual bool AttributesEqual(Computation* other) const { return true; }
 
   virtual bool HasSideEffect() const { return false; }
 
   virtual Definition* TryReplace(BindInstr* instr) const;
 
   Value* value() const { return inputs_[0]; }
 
-  intptr_t deopt_id() const { return original_->deopt_id(); }
+  intptr_t deopt_id() const { return instance_call_->deopt_id(); }
 
  private:
-  InstanceCallComp* original_;
+  InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckSmiComp);
 };
 
 
 class CheckArrayBoundComp : public TemplateComputation<2> {
  public:
   CheckArrayBoundComp(Value* array,
                       Value* index,
                       intptr_t array_type,
-                      InstanceCallComp* original)
-      : array_type_(array_type), original_(original) {
+                      InstanceCallComp* instance_call)
+      : array_type_(array_type), instance_call_(instance_call) {
     ASSERT(array != NULL);
     ASSERT(index != NULL);
     inputs_[0] = array;
     inputs_[1] = index;
   }
 
   DECLARE_COMPUTATION(CheckArrayBound)
 
   virtual bool CanDeoptimize() const { return true; }
   virtual intptr_t ResultCid() const { return kIllegalCid; }
 
   virtual bool AttributesEqual(Computation* other) const;
 
   virtual bool HasSideEffect() const { return false; }
 
   Value* array() const { return inputs_[0]; }
   Value* index() const { return inputs_[1]; }
 
   intptr_t array_type() const { return array_type_; }
 
-  intptr_t deopt_id() const { return original_->deopt_id(); }
+  intptr_t deopt_id() const { return instance_call_->deopt_id(); }
 
  private:
   intptr_t array_type_;
-  InstanceCallComp* original_;
+  InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckArrayBoundComp);
 };
 
 
 #undef DECLARE_COMPUTATION
 
 
 // Implementation of type testers and cast functins.
 #define DEFINE_COMPUTATION_PREDICATE(ShortName, ClassName)                     \
@@ skipping 1170 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_