[strong] Stricter check for referring to other classes inside methods.

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 31 matching lines @@
     CONTEXT,
 
     // A named slot in a heap context.  name() is the variable name in the
     // context object on the heap, with lookup starting at the current
     // context.  index() is invalid.
     LOOKUP
   };
 
   Variable(Scope* scope, const AstRawString* name, VariableMode mode, Kind kind,
            InitializationFlag initialization_flag,
-           MaybeAssignedFlag maybe_assigned_flag = kNotAssigned);
+           MaybeAssignedFlag maybe_assigned_flag = kNotAssigned,
+           int consecutive_declaration_group_start = -1);
 
   // Printing support
   static const char* Mode2String(VariableMode mode);
 
   // 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 script 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_->string(); }
   const AstRawString* raw_name() const { return name_; }
   VariableMode mode() const { return mode_; }
   bool has_forced_context_allocation() const {
     return force_context_allocation_;
   }
   void ForceContextAllocation() {
     DCHECK(mode_ != TEMPORARY);
     force_context_allocation_ = true;
   }
   bool is_used() { return is_used_; }
   void set_is_used() { is_used_ = true; }
   MaybeAssignedFlag maybe_assigned() const { return maybe_assigned_; }
   void set_maybe_assigned() { maybe_assigned_ = kMaybeAssigned; }
+  int consecutive_declaration_group_start() const {
+    return consecutive_declaration_group_start_;
+  }
 
   int initializer_position() { return initializer_position_; }
   void set_initializer_position(int pos) { initializer_position_ = pos; }
 
   bool IsVariable(Handle<String> n) const {
     return !is_this() && name().is_identical_to(n);
   }
 
   bool IsUnallocated() const { return location_ == UNALLOCATED; }
   bool IsParameter() const { return location_ == PARAMETER; }
@@ skipping 54 matching lines @@
   }
 
   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_;
   }
 
+  Variable* corresponding_outer_class_variable() const {
+    return corresponding_outer_class_variable_;
+  }
+  void set_corresponding_outer_class_variable(Variable* var) {
+    corresponding_outer_class_variable_ = var;
+  }
+
  private:
   Scope* scope_;
   const AstRawString* name_;
   VariableMode mode_;
   Kind kind_;
   Location 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_;
 
   // Usage info.
   bool force_context_allocation_;  // set by variable resolver
   bool is_used_;
   InitializationFlag initialization_flag_;
   MaybeAssignedFlag maybe_assigned_;
+
+  // For classes and functions we keep track of consecutive groups of class /
+  // function delcarations. They are needed for strong mode scoping
+  // checks. TODO(marja, rossberg): Implement checks for functions too.
+  int consecutive_declaration_group_start_;
+  // For classes.
+  Variable* corresponding_outer_class_variable_;

[rossberg, 2015/04/21 13:30:02]

As discussed offline, maybe we want to introduce a subclass ClassVariable for
this.

[marja, 2015/04/23 09:52:37]

Done.

 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_VARIABLES_H_