Reapply r9673 "Scope tree serialization and ScopeIterator cleanup."

src/scopeinfo.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 17 matching lines @@
 #ifndef V8_SCOPEINFO_H_
 #define V8_SCOPEINFO_H_
 
 #include "allocation.h"
 #include "variables.h"
 #include "zone-inl.h"
 
 namespace v8 {
 namespace internal {
 
-// Scope information represents information about a functions's
-// scopes (currently only one, because we don't do any inlining)
-// and the allocation of the scope's variables. Scope information
-// is stored in a compressed form in FixedArray objects and is used
+// ScopeInfo represents information about different scopes of a source
+// program  and the allocation of the scope's variables. Scope information
+// is stored in a compressed form in SerializedScopeInfo objects and is used
 // at runtime (stack dumps, deoptimization, etc.).
-//
-// Historical note: In other VMs built by this team, ScopeInfo was
-// usually called DebugInfo since the information was used (among
-// other things) for on-demand debugging (Self, Smalltalk). However,
-// DebugInfo seems misleading, since this information is primarily used
-// in debugging-unrelated contexts.
 
 // Forward defined as
 // template <class Allocator = FreeStoreAllocationPolicy> class ScopeInfo;
 template<class Allocator>
 class ScopeInfo BASE_EMBEDDED {
  public:
   // Create a ScopeInfo instance from a scope.
   explicit ScopeInfo(Scope* scope);
 
   // Create a ScopeInfo instance from SerializedScopeInfo.
@@ skipping 17 matching lines @@
     return context_slots_[i - Context::MIN_CONTEXT_SLOTS];
   }
   int number_of_context_slots() const {
     int l = context_slots_.length();
     return l == 0 ? 0 : l + Context::MIN_CONTEXT_SLOTS;
   }
 
   Handle<String> LocalName(int i) const;
   int NumberOfLocals() const;
 
+  ScopeType type() const { return type_; }
   // --------------------------------------------------------------------------
   // Debugging support
 
 #ifdef DEBUG
   void Print();
 #endif
 
  private:
   Handle<String> function_name_;
   bool calls_eval_;
   bool is_strict_mode_;
+  ScopeType type_;
   List<Handle<String>, Allocator > parameters_;
   List<Handle<String>, Allocator > stack_slots_;
   List<Handle<String>, Allocator > context_slots_;
   List<VariableMode, Allocator > context_modes_;
 };
 
 
 // Cache for mapping (data, property name) into context slot index.
 // The cache contains both positive and negative results.
 // Slot index equals -1 means the property is absent.
@@ skipping 70 matching lines @@
   uint32_t values_[kLength];
 
   friend class Isolate;
   DISALLOW_COPY_AND_ASSIGN(ContextSlotCache);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SCOPEINFO_H_