Revert to code state of 3.13.1 plus r12350

src/contexts.h

 // Copyright 2012 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 78 matching lines @@
 
 // Heap-allocated activation contexts.
 //
 // Contexts are implemented as FixedArray objects; the Context
 // class is a convenience interface casted on a FixedArray object.
 //
 // Note: Context must have no virtual functions and Context objects
 // must always be allocated via Heap::AllocateContext() or
 // Factory::NewContext.
 
-#define NATIVE_CONTEXT_FIELDS(V) \
+#define GLOBAL_CONTEXT_FIELDS(V) \
   V(GLOBAL_PROXY_INDEX, JSObject, global_proxy_object) \
   V(SECURITY_TOKEN_INDEX, Object, security_token) \
   V(BOOLEAN_FUNCTION_INDEX, JSFunction, boolean_function) \
   V(NUMBER_FUNCTION_INDEX, JSFunction, number_function) \
   V(STRING_FUNCTION_INDEX, JSFunction, string_function) \
   V(STRING_FUNCTION_PROTOTYPE_MAP_INDEX, Map, string_function_prototype_map) \
   V(OBJECT_FUNCTION_INDEX, JSFunction, object_function) \
   V(INTERNAL_ARRAY_FUNCTION_INDEX, JSFunction, internal_array_function) \
   V(ARRAY_FUNCTION_INDEX, JSFunction, array_function) \
   V(JS_ARRAY_MAPS_INDEX, Object, js_array_maps) \
@@ skipping 76 matching lines @@
 // [ extension ]  A pointer to an extension JSObject, or NULL. Used to
 //                implement 'with' statements and dynamic declarations
 //                (through 'eval'). The object in a 'with' statement is
 //                stored in the extension slot of a 'with' context.
 //                Dynamically declared variables/functions are also added
 //                to lazily allocated extension object. Context::Lookup
 //                searches the extension object for properties.
 //                For block contexts, contains the respective ScopeInfo.
 //                For module contexts, points back to the respective JSModule.
 //
-// [ global_object ]  A pointer to the global object. Provided for quick
+// [ global    ]  A pointer to the global object. Provided for quick
 //                access to the global object from inside the code (since
 //                we always have a context pointer).
 //
 // In addition, function contexts may have statically allocated context slots
 // to store local variables/functions that are accessed from inner functions
 // (via static context addresses) or through 'eval' (dynamic context lookups).
-// Finally, the native context contains additional slots for fast access to
-// native properties.
+// Finally, the global context contains additional slots for fast access to
+// global properties.
 
 class Context: public FixedArray {
  public:
   // Conversions.
   static Context* cast(Object* context) {
     ASSERT(context->IsContext());
     return reinterpret_cast<Context*>(context);
   }
 
   // The default context slot layout; indices are FixedArray slot indices.
   enum {
     // These slots are in all contexts.
     CLOSURE_INDEX,
     PREVIOUS_INDEX,
     // The extension slot is used for either the global object (in global
     // contexts), eval extension object (function contexts), subject of with
     // (with contexts), or the variable name (catch contexts), the serialized
     // scope info (block contexts), or the module instance (module contexts).
     EXTENSION_INDEX,
-    GLOBAL_OBJECT_INDEX,
+    GLOBAL_INDEX,
     MIN_CONTEXT_SLOTS,
 
     // This slot holds the thrown value in catch contexts.
     THROWN_OBJECT_INDEX = MIN_CONTEXT_SLOTS,
 
-    // These slots are only in native contexts.
+    // These slots are only in global contexts.
     GLOBAL_PROXY_INDEX = MIN_CONTEXT_SLOTS,
     SECURITY_TOKEN_INDEX,
     ARGUMENTS_BOILERPLATE_INDEX,
     ALIASED_ARGUMENTS_BOILERPLATE_INDEX,
     STRICT_MODE_ARGUMENTS_BOILERPLATE_INDEX,
     REGEXP_RESULT_MAP_INDEX,
     FUNCTION_MAP_INDEX,
     STRICT_MODE_FUNCTION_MAP_INDEX,
     FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX,
     STRICT_MODE_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX,
@@ skipping 46 matching lines @@
     PROXY_ENUMERATE,
     RANDOM_SEED_INDEX,
 
     // Properties from here are treated as weak references by the full GC.
     // Scavenge treats them as strong references.
     OPTIMIZED_FUNCTIONS_LIST,  // Weak.
     MAP_CACHE_INDEX,  // Weak.
     NEXT_CONTEXT_LINK,  // Weak.
 
     // Total number of slots.
-    NATIVE_CONTEXT_SLOTS,
+    GLOBAL_CONTEXT_SLOTS,
 
     FIRST_WEAK_SLOT = OPTIMIZED_FUNCTIONS_LIST
   };
 
   // Direct slot access.
   JSFunction* closure() { return JSFunction::cast(get(CLOSURE_INDEX)); }
   void set_closure(JSFunction* closure) { set(CLOSURE_INDEX, closure); }
 
   Context* previous() {
     Object* result = unchecked_previous();
     ASSERT(IsBootstrappingOrValidParentContext(result, this));
     return reinterpret_cast<Context*>(result);
   }
   void set_previous(Context* context) { set(PREVIOUS_INDEX, context); }
 
   bool has_extension() { return extension() != NULL; }
   Object* extension() { return get(EXTENSION_INDEX); }
   void set_extension(Object* object) { set(EXTENSION_INDEX, object); }
 
   JSModule* module() { return JSModule::cast(get(EXTENSION_INDEX)); }
   void set_module(JSModule* module) { set(EXTENSION_INDEX, module); }
 
   // Get the context where var declarations will be hoisted to, which
   // may be the context itself.
   Context* declaration_context();
 
-  GlobalObject* global_object() {
-    Object* result = get(GLOBAL_OBJECT_INDEX);
+  GlobalObject* global() {
+    Object* result = get(GLOBAL_INDEX);
     ASSERT(IsBootstrappingOrGlobalObject(result));
     return reinterpret_cast<GlobalObject*>(result);
   }
-  void set_global_object(GlobalObject* object) {
-    set(GLOBAL_OBJECT_INDEX, object);
-  }
+  void set_global(GlobalObject* global) { set(GLOBAL_INDEX, global); }
 
   // Returns a JSGlobalProxy object or null.
   JSObject* global_proxy();
   void set_global_proxy(JSObject* global);
 
   // The builtins object.
   JSBuiltinsObject* builtins();
 
-  // Compute the native context by traversing the context chain.
-  Context* native_context();
+  // Compute the global context by traversing the context chain.
+  Context* global_context();
 
-  // Predicates for context types.  IsNativeContext is defined on Object
-  // because we frequently have to know if arbitrary objects are natives
+  // Predicates for context types.  IsGlobalContext is defined on Object
+  // because we frequently have to know if arbitrary objects are global
   // contexts.
   bool IsFunctionContext() {
     Map* map = this->map();
     return map == map->GetHeap()->function_context_map();
   }
   bool IsCatchContext() {
     Map* map = this->map();
     return map == map->GetHeap()->catch_context_map();
   }
   bool IsWithContext() {
     Map* map = this->map();
     return map == map->GetHeap()->with_context_map();
   }
   bool IsBlockContext() {
     Map* map = this->map();
     return map == map->GetHeap()->block_context_map();
   }
   bool IsModuleContext() {
     Map* map = this->map();
     return map == map->GetHeap()->module_context_map();
   }
 
-  // Tells whether the native context is marked with out of memory.
+  // Tells whether the global context is marked with out of memory.
   inline bool has_out_of_memory();
 
-  // Mark the native context with out of memory.
+  // Mark the global context with out of memory.
   inline void mark_out_of_memory();
 
-  // A native context hold a list of all functions which have been optimized.
+  // A global context hold a list of all functions which have been optimized.
   void AddOptimizedFunction(JSFunction* function);
   void RemoveOptimizedFunction(JSFunction* function);
   Object* OptimizedFunctionsListHead();
   void ClearOptimizedFunctions();
 
-#define NATIVE_CONTEXT_FIELD_ACCESSORS(index, type, name) \
+#define GLOBAL_CONTEXT_FIELD_ACCESSORS(index, type, name) \
   void  set_##name(type* value) {                         \
-    ASSERT(IsNativeContext());                            \
+    ASSERT(IsGlobalContext());                            \
     set(index, value);                                    \
   }                                                       \
   type* name() {                                          \
-    ASSERT(IsNativeContext());                            \
+    ASSERT(IsGlobalContext());                            \
     return type::cast(get(index));                        \
   }
-  NATIVE_CONTEXT_FIELDS(NATIVE_CONTEXT_FIELD_ACCESSORS)
-#undef NATIVE_CONTEXT_FIELD_ACCESSORS
+  GLOBAL_CONTEXT_FIELDS(GLOBAL_CONTEXT_FIELD_ACCESSORS)
+#undef GLOBAL_CONTEXT_FIELD_ACCESSORS
 
   // Lookup the slot called name, starting with the current context.
   // There are three possibilities:
   //
   // 1) result->IsContext():
   //    The binding was found in a context.  *index is always the
   //    non-negative slot index.  *attributes is NONE for var and let
   //    declarations, READ_ONLY for const declarations (never ABSENT).
   //
   // 2) result->IsJSObject():
   //    The binding was found as a named property in a context extension
   //    object (i.e., was introduced via eval), as a property on the subject
   //    of with, or as a property of the global object.  *index is -1 and
   //    *attributes is not ABSENT.
   //
   // 3) result.is_null():
   //    There was no binding found, *index is always -1 and *attributes is
   //    always ABSENT.
   Handle<Object> Lookup(Handle<String> name,
                         ContextLookupFlags flags,
                         int* index,
                         PropertyAttributes* attributes,
                         BindingFlags* binding_flags);
 
   // Code generation support.
   static int SlotOffset(int index) {
     return kHeaderSize + index * kPointerSize - kHeapObjectTag;
   }
 
-  static const int kSize = kHeaderSize + NATIVE_CONTEXT_SLOTS * kPointerSize;
+  static const int kSize = kHeaderSize + GLOBAL_CONTEXT_SLOTS * kPointerSize;
 
   // GC support.
   typedef FixedBodyDescriptor<
       kHeaderSize, kSize, kSize> ScavengeBodyDescriptor;
 
   typedef FixedBodyDescriptor<
       kHeaderSize,
       kHeaderSize + FIRST_WEAK_SLOT * kPointerSize,
       kSize> MarkCompactBodyDescriptor;
 
  private:
   // Unchecked access to the slots.
   Object* unchecked_previous() { return get(PREVIOUS_INDEX); }
 
 #ifdef DEBUG
   // Bootstrapping-aware type checks.
   static bool IsBootstrappingOrValidParentContext(Object* object, Context* kid);
   static bool IsBootstrappingOrGlobalObject(Object* object);
 #endif
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CONTEXTS_H_