Merged: Squashed multiple commits.

src/variables.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_VARIABLES_H_
 #define V8_VARIABLES_H_
 
 #include "src/ast-value-factory.h"
 #include "src/zone.h"
 
@@ skipping 106 matching lines @@
   int index() const { return index_; }
   InitializationFlag initialization_flag() const {
     return initialization_flag_;
   }
 
   void AllocateTo(VariableLocation location, int index) {
     location_ = location;
     index_ = index;
   }
 
+  void SetFromEval() { is_from_eval_ = true; }
+
   static int CompareIndex(Variable* const* v, Variable* const* w);
 
   void RecordStrongModeReference(int start_position, int end_position) {
     // Record the earliest reference to the variable. Used in error messages for
     // strong mode references to undeclared variables.
     if (has_strong_mode_reference_ &&
         strong_mode_reference_start_position_ < start_position)
       return;
     has_strong_mode_reference_ = true;
     strong_mode_reference_start_position_ = start_position;
     strong_mode_reference_end_position_ = end_position;
   }
 
   bool has_strong_mode_reference() const { return has_strong_mode_reference_; }
   int strong_mode_reference_start_position() const {
     return strong_mode_reference_start_position_;
   }
   int strong_mode_reference_end_position() const {
     return strong_mode_reference_end_position_;
   }
+  PropertyAttributes DeclarationPropertyAttributes() const {
+    int property_attributes = NONE;
+    if (IsImmutableVariableMode(mode_)) {
+      property_attributes |= READ_ONLY;
+    }
+    if (is_from_eval_) {
+      property_attributes |= EVAL_DECLARED;
+    }
+    return static_cast<PropertyAttributes>(property_attributes);
+  }
 
  private:
   Scope* scope_;
   const AstRawString* name_;
   VariableMode mode_;
   Kind kind_;
   VariableLocation location_;
   int index_;
   int initializer_position_;
   // Tracks whether the variable is bound to a VariableProxy which is in strong
   // mode, and if yes, the source location of the reference.
   bool has_strong_mode_reference_;
   int strong_mode_reference_start_position_;
   int strong_mode_reference_end_position_;
 
   // If this field is set, this variable references the stored locally bound
   // variable, but it might be shadowed by variable bindings introduced by
   // sloppy 'eval' calls between the reference scope (inclusive) and the
   // binding scope (exclusive).
   Variable* local_if_not_shadowed_;
 
+  // True if this variable is introduced by a sloppy eval
+  bool is_from_eval_;
+
   // Usage info.
   bool force_context_allocation_;  // set by variable resolver
   bool is_used_;
   InitializationFlag initialization_flag_;
   MaybeAssignedFlag maybe_assigned_;
 };
 
 class ClassVariable : public Variable {
  public:
   ClassVariable(Scope* scope, const AstRawString* name, VariableMode mode,
@@ skipping 11 matching lines @@
 
  private:
   // For classes we keep track of consecutive groups of delcarations. They are
   // needed for strong mode scoping checks. TODO(marja, rossberg): Implement
   // checks for functions too.
   int declaration_group_start_;
 };
 } }  // namespace v8::internal
 
 #endif  // V8_VARIABLES_H_