Implement x64 compilation for loading and storing local variables.

runtime/vm/scopes.h

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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_SCOPES_H_
 #define VM_SCOPES_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/growable_array.h"
 
 namespace dart {
 
 class LocalScope;
 class LocalVariable;
 class SourceLabel;
 
 
 class LocalVariable : public ZoneAllocated {
  public:
   LocalVariable(intptr_t token_index,
                 const String& name,
                 const AbstractType& type)
     : token_index_(token_index),
       name_(name),
       owner_(NULL),
       type_(type),
       is_final_(false),
       is_captured_(false),
       is_invisible_(false),
-      index_(LocalVariable::kUnitializedIndex_) {
+      index_(LocalVariable::kUnitializedIndex) {
     ASSERT(type.IsZoneHandle());
     ASSERT(type.IsFinalized());
   }
 
   intptr_t token_index() const { return token_index_; }
   const String& name() const { return name_; }
   LocalScope* owner() const { return owner_; }
   void set_owner(LocalScope* owner) {
     ASSERT(owner_ == NULL);
     owner_ = owner;
   }
 
   const AbstractType& type() const { return type_; }
 
   bool is_final() const { return is_final_; }
   void set_is_final() { is_final_ = true; }
 
   bool is_captured() const { return is_captured_; }
   void set_is_captured() { is_captured_ = true; }
 
   bool HasIndex() const {
-    return index_ != kUnitializedIndex_;
+    return index_ != kUnitializedIndex;
   }
   int index() const {
     ASSERT(HasIndex());
     return index_;
   }
   void set_index(int index) {
-    ASSERT(!HasIndex());
-    ASSERT(index != kUnitializedIndex_);
+    ASSERT(!HasIndex() || (index_ == index));

[Kevin Millikin (Google), 2012/02/27 13:40:42]

There's no simple way to clear variables that have an assigned index when we
bailout of the optimizing compiler.  I modified this function to allow setting
the index as long as it doesn't change.

+    ASSERT(index != kUnitializedIndex);
     index_ = index;
   }
 
   void set_invisible(bool value) {
     is_invisible_ = value;
   }
 
   bool Equals(const LocalVariable& other) const;
 
  private:
-  static const int kUnitializedIndex_ = INT_MIN;
+  static const int kUnitializedIndex = INT_MIN;
 
   const intptr_t token_index_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this variable.
 
   const AbstractType& type_;  // Declaration type of local variable.
 
   bool is_final_;  // If true, this variable is readonly.
   bool is_captured_;  // If true, this variable lives in the context, otherwise
                       // in the stack frame.
@@ skipping 79 matching lines @@
   LocalScope* sibling() const { return sibling_; }
   int function_level() const { return function_level_; }
   int loop_level() const { return loop_level_; }
 
   // Check if this scope is nested within the passed in scope.
   bool IsNestedWithin(LocalScope* scope) const;
 
   // The context level is only set in a scope that is either the owner scope of
   // a captured variable or that is the owner scope of a context.
   bool HasContextLevel() const {
-    return context_level_ != kUnitializedContextLevel_;
+    return context_level_ != kUnitializedContextLevel;
   }
   int context_level() const {
     ASSERT(HasContextLevel());
     return context_level_;
   }
   void set_context_level(int context_level) {
     ASSERT(!HasContextLevel());
-    ASSERT(context_level != kUnitializedContextLevel_);
+    ASSERT(context_level != kUnitializedContextLevel);
     context_level_ = context_level;
   }
 
   intptr_t end_token_index() const { return end_token_index_; }
   void set_end_token_index(intptr_t value) { end_token_index_ = value; }
 
   // The number of variables allocated in the context and belonging to this
   // scope and to its children at the same loop level.
   int num_context_variables() const { return num_context_variables_; }
 
@@ skipping 85 matching lines @@
   // Allocate the variable in the current context, possibly updating the current
   // context owner scope, if the variable is the first one to be allocated at
   // this loop level.
   // The variable may belong to this scope or to any of its children, but at the
   // same loop level.
   void AllocateContextVariable(LocalVariable* variable,
                                LocalScope** context_owner);
 
   void CollectLocalVariables(GrowableArray<LocalVariable*>* vars);
 
-  static const int kUnitializedContextLevel_ = INT_MIN;
+  static const int kUnitializedContextLevel = INT_MIN;
   LocalScope* parent_;
   LocalScope* child_;
   LocalScope* sibling_;
   int function_level_;  // Reflects the nesting level of local functions.
   int loop_level_;  // Reflects the loop nesting level.
   int context_level_;  // Reflects the level of the runtime context.
   int num_context_variables_;  // Only set if this scope is a context owner.
   intptr_t end_token_index_;  // Token index of end of scope.
   GrowableArray<LocalVariable*> variables_;
   GrowableArray<SourceLabel*> labels_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCOPES_H_