Store pointer instead of reference to LocalVariable in ast and flow graph.

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 741 matching lines @@
   const Array& argument_names_;
   ZoneGrowableArray<PushArgumentInstr*>* arguments_;
   MethodRecognizer::Kind recognized_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticCallComp);
 };
 
 
 class LoadLocalComp : public TemplateComputation<0> {
  public:
-  LoadLocalComp(const LocalVariable& local, intptr_t context_level)
+  LoadLocalComp(const LocalVariable* local, intptr_t context_level)
       : local_(local),
-        context_level_(context_level) { }
+        context_level_(context_level) {
+    ASSERT(local_ != NULL);
+  }
 
   DECLARE_COMPUTATION(LoadLocal)
 
-  const LocalVariable& local() const { return local_; }
+  const LocalVariable* local() const { return local_; }
   intptr_t context_level() const { return context_level_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
  private:
-  const LocalVariable& local_;
+  const LocalVariable* local_;
   const intptr_t context_level_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadLocalComp);
 };
 
 
 class StoreLocalComp : public TemplateComputation<1> {
  public:
-  StoreLocalComp(const LocalVariable& local,
+  StoreLocalComp(const LocalVariable* local,
                  Value* value,
                  intptr_t context_level)
       : local_(local),
         context_level_(context_level) {
+    ASSERT(local_ != NULL);
     inputs_[0] = value;
   }
 
   DECLARE_COMPUTATION(StoreLocal)
 
-  const LocalVariable& local() const { return local_; }
+  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,
                                   intptr_t fixed_parameter_count);
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
  private:
-  const LocalVariable& local_;
+  const LocalVariable* local_;
   const intptr_t context_level_;
 
   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 740 matching lines @@
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
 
   DISALLOW_COPY_AND_ASSIGN(CloneContextComp);
 };
 
 
 class CatchEntryComp : public TemplateComputation<0> {
  public:
-  CatchEntryComp(const LocalVariable& exception_var,
-                 const LocalVariable& stacktrace_var)
-      : exception_var_(exception_var), stacktrace_var_(stacktrace_var) {}
+  CatchEntryComp(const LocalVariable* exception_var,
+                 const LocalVariable* stacktrace_var)
+      : exception_var_(exception_var), stacktrace_var_(stacktrace_var) {
+    ASSERT(exception_var_ != NULL);
+    ASSERT(stacktrace_var_ != NULL);
+  }
 
-  const LocalVariable& exception_var() const { return exception_var_; }
-  const LocalVariable& stacktrace_var() const { return stacktrace_var_; }
+  const LocalVariable* exception_var() const { return exception_var_; }
+  const LocalVariable* stacktrace_var() const { return stacktrace_var_; }
 
   DECLARE_COMPUTATION(CatchEntry)
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
  private:
-  const LocalVariable& exception_var_;
-  const LocalVariable& stacktrace_var_;
+  const LocalVariable* exception_var_;
+  const LocalVariable* stacktrace_var_;
 
   DISALLOW_COPY_AND_ASSIGN(CatchEntryComp);
 };
 
 
 class BinaryOpComp : public TemplateComputation<2> {
  public:
   enum OperandsType {
     kDynamicOperands,
     kSmiOperands,
@@ skipping 1228 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_