Add a location summary to LoadLocal, StoreLocal and ConstantVal.

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 243 matching lines @@
 
  private:
   Definition* const definition_;
 
   DISALLOW_COPY_AND_ASSIGN(UseVal);
 };
 
 
 class ConstantVal: public Value {
  public:
-  explicit ConstantVal(const Object& value) : value_(value) {
+  explicit ConstantVal(const Object& value)
+      : value_(value),
+        location_summary_(MakeLocationSummary()) {
     ASSERT(value.IsZoneHandle());
   }
 
   DECLARE_VALUE(Constant)
 
   const Object& value() const { return value_; }
 
+  virtual LocationSummary* locs() const {

[Vyacheslav Egorov (Google), 2012/05/22 02:47:59]

we starting to duplicate boilerplate. maybe macros?

[Florian Schneider, 2012/05/22 06:33:08]

Yes, I think location_summary_ should move to a super-class so that we can make
all these declarations part of the DECLARE_...-macros eventually.

[srdjan, 2012/05/22 16:50:32]

Maybe move it to class Computation right now and implement only
MakeLocationSummary everywhere.

+    return location_summary_;
+  }
+
+  // Platform specific summary factory for this instruction.
+  LocationSummary* MakeLocationSummary();
+
+  virtual void EmitNativeCode(FlowGraphCompiler* compiler);
+
  private:
   const Object& value_;
+  LocationSummary* location_summary_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstantVal);
 };
 
 #undef DECLARE_VALUE
 
 
 class AssertAssignableComp : public Computation {
  public:
   AssertAssignableComp(intptr_t token_index,
@@ skipping 320 matching lines @@
   ZoneGrowableArray<Value*>* arguments_;
   LocationSummary* location_summary_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticCallComp);
 };
 
 
 class LoadLocalComp : public TemplateComputation<0> {
  public:
   LoadLocalComp(const LocalVariable& local, intptr_t context_level)
-      : local_(local), context_level_(context_level) { }
+      : local_(local),
+        context_level_(context_level),
+        location_summary_(MakeLocationSummary()) { }
 
   DECLARE_COMPUTATION(LoadLocal)
 
   const LocalVariable& local() const { return local_; }
   intptr_t context_level() const { return context_level_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
+  virtual LocationSummary* locs() const {
+    return location_summary_;
+  }
+
+  // Platform specific summary factory for this instruction.
+  LocationSummary* MakeLocationSummary();
+
+  virtual void EmitNativeCode(FlowGraphCompiler* compiler);
+
  private:
   const LocalVariable& local_;
   const intptr_t context_level_;
+  LocationSummary* location_summary_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadLocalComp);
 };
 
 
 class StoreLocalComp : public TemplateComputation<1> {
  public:
   StoreLocalComp(const LocalVariable& local,
                  Value* value,
                  intptr_t context_level)
-      : local_(local), context_level_(context_level) {
+      : local_(local),
+        context_level_(context_level),
+        location_summary_(MakeLocationSummary()) {
     inputs_[0] = value;
   }
 
   DECLARE_COMPUTATION(StoreLocal)
 
   const LocalVariable& local() const { return local_; }
   Value* value() const { return inputs_[0]; }
   intptr_t context_level() const { return context_level_; }
 
   virtual void RecordAssignedVars(BitVector* assigned_vars);
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
+  virtual LocationSummary* locs() const {
+    return location_summary_;
+  }
+
+  // Platform specific summary factory for this instruction.
+  LocationSummary* MakeLocationSummary();
+
+  virtual void EmitNativeCode(FlowGraphCompiler* compiler);
+
  private:
   const LocalVariable& local_;
   const intptr_t context_level_;
+  LocationSummary* location_summary_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreLocalComp);
 };
 
 
 class NativeCallComp : public TemplateComputation<0> {
  public:
   NativeCallComp(NativeBodyNode* node, intptr_t try_index)
       : ast_node_(*node), try_index_(try_index) {}
 
@@ skipping 1236 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_