Inline setters, getters, various cleanups & restructuring.

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 76 matching lines @@
     Isolate* isolate = Isolate::Current();
     cid_ = GetNextCid(isolate);
     ic_data_ = GetICDataForCid(cid_, isolate);
   }
 
   // Unique computation/instruction id, used for deoptimization.
   intptr_t cid() const { return cid_; }
 
   ICData* ic_data() const { return ic_data_; }
   void set_ic_data(ICData* value) { ic_data_ = value; }
+  bool HasICData() const {
+    return (ic_data() != NULL) && !ic_data()->IsNull();
+  }
 
   // Visiting support.
   virtual void Accept(FlowGraphVisitor* visitor) = 0;
 
   virtual intptr_t InputCount() const = 0;
   virtual Value* InputAt(intptr_t i) const = 0;
 
   // Static type of the computation.
   virtual RawAbstractType* StaticType() const = 0;
 
@@ skipping 547 matching lines @@
  private:
   const NativeBodyNode& ast_node_;
   const intptr_t try_index_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeCallComp);
 };
 
 
 class LoadInstanceFieldComp : public TemplateComputation<1> {
  public:
-  LoadInstanceFieldComp(LoadInstanceFieldNode* ast_node, Value* instance)
-      : ast_node_(*ast_node) {
+  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) {
     ASSERT(instance != NULL);
     inputs_[0] = instance;
   }
 
   DECLARE_COMPUTATION(LoadInstanceField)
 
-  const Field& field() const { return ast_node_.field(); }
-
+  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 LoadInstanceFieldNode& ast_node_;
+  const Field& field_;
+  const InstanceCallComp* original_;  // For optimizations.
+  // If non-NULL, the instruction is valid only for the clas ids listed.

[Florian Schneider, 2012/06/07 08:47:59]

s/clas/class/

[srdjan, 2012/06/07 18:24:50]

Done.

+  const ZoneGrowableArray<intptr_t>* class_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadInstanceFieldComp);
 };
 
 
 class StoreInstanceFieldComp : public TemplateComputation<2> {
  public:
-  StoreInstanceFieldComp(StoreInstanceFieldNode* ast_node,
+  StoreInstanceFieldComp(const Field& field,
                          Value* instance,
-                         Value* value)
-      : ast_node_(*ast_node) {
+                         Value* value,
+                         InstanceSetterComp* original,  // Maybe NULL.
+                         ZoneGrowableArray<intptr_t>* class_ids)  // Maybe NULL.
+      : field_(field), original_(original), class_ids_(class_ids) {
     ASSERT(instance != NULL);
     ASSERT(value != NULL);
     inputs_[0] = instance;
     inputs_[1] = value;
   }
 
   DECLARE_COMPUTATION(StoreInstanceField)
 
-  intptr_t token_index() const { return ast_node_.token_index(); }
-  const Field& field() const { return ast_node_.field(); }
+  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 StoreInstanceFieldNode& ast_node_;
+  const Field& field_;
+  const InstanceSetterComp* original_;  // For optimizations.
+  // If non-NULL, the instruction is valid only for the clas ids listed.

[Florian Schneider, 2012/06/07 08:47:59]

s/clas/class/

[srdjan, 2012/06/07 18:24:50]

Done.

+  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 1280 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_