NewGC: Merge bleeding edge up to 9009.

src/variables.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 28 matching lines @@
 // after binding and variable allocation.
 
 class Variable: public ZoneObject {
  public:
   enum Mode {
     // User declared variables:
     VAR,       // declared via 'var', and 'function' declarations
 
     CONST,     // declared via 'const' declarations
 
+    LET,       // declared via 'let' declarations
+
     // Variables introduced by the compiler:
     DYNAMIC,         // always require dynamic lookup (we don't know
                      // the declaration)
 
     DYNAMIC_GLOBAL,  // requires dynamic lookup, but we know that the
                      // variable is global unless it has been shadowed
                      // by an eval-introduced variable
 
     DYNAMIC_LOCAL,   // requires dynamic lookup, but we know that the
                      // variable is local and where it is unless it
@@ skipping 29 matching lines @@
   bool IsValidLeftHandSide() { return is_valid_LHS_; }
 
   // The source code for an eval() call may refer to a variable that is
   // in an outer scope about which we don't know anything (it may not
   // be the global scope). scope() is NULL in that case. Currently the
   // scope is only used to follow the context chain length.
   Scope* scope() const { return scope_; }
 
   Handle<String> name() const { return name_; }
   Mode mode() const { return mode_; }
-  bool is_accessed_from_inner_scope() const {
-    return is_accessed_from_inner_scope_;
+  bool is_accessed_from_inner_function_scope() const {
+    return is_accessed_from_inner_function_scope_;
   }
-  void MarkAsAccessedFromInnerScope() {
-    is_accessed_from_inner_scope_ = true;
+  void MarkAsAccessedFromInnerFunctionScope() {
+    ASSERT(mode_ != TEMPORARY);
+    is_accessed_from_inner_function_scope_ = true;
   }
   bool is_used() { return is_used_; }
   void set_is_used(bool flag) { is_used_ = flag; }
 
   bool IsVariable(Handle<String> n) const {
     return !is_this() && name().is_identical_to(n);
   }
 
   bool IsStackAllocated() const;
   bool IsParameter() const;  // Includes 'this'.
@@ skipping 36 matching lines @@
 
   Variable* local_if_not_shadowed_;
 
   // Code generation.
   Slot* rewrite_;
 
   // Valid as a LHS? (const and this are not valid LHS, for example)
   bool is_valid_LHS_;
 
   // Usage info.
-  bool is_accessed_from_inner_scope_;  // set by variable resolver
+  bool is_accessed_from_inner_function_scope_;  // set by variable resolver
   bool is_used_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_VARIABLES_H_