Revert to code state of 3.13.1 plus r12350

src/contexts.cc

 // 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 18 matching lines @@
 
 #include "bootstrapper.h"
 #include "debug.h"
 #include "scopeinfo.h"
 
 namespace v8 {
 namespace internal {
 
 Context* Context::declaration_context() {
   Context* current = this;
-  while (!current->IsFunctionContext() && !current->IsNativeContext()) {
+  while (!current->IsFunctionContext() && !current->IsGlobalContext()) {
     current = current->previous();
     ASSERT(current->closure() == closure());
   }
   return current;
 }
 
 
 JSBuiltinsObject* Context::builtins() {
-  GlobalObject* object = global_object();
+  GlobalObject* object = global();
   if (object->IsJSGlobalObject()) {
     return JSGlobalObject::cast(object)->builtins();
   } else {
     ASSERT(object->IsJSBuiltinsObject());
     return JSBuiltinsObject::cast(object);
   }
 }
 
 
-Context* Context::native_context() {
+Context* Context::global_context() {
   // Fast case: the global object for this context has been set.  In
   // that case, the global object has a direct pointer to the global
   // context.
-  if (global_object()->IsGlobalObject()) {
-    return global_object()->native_context();
+  if (global()->IsGlobalObject()) {
+    return global()->global_context();
   }
 
   // During bootstrapping, the global object might not be set and we
-  // have to search the context chain to find the native context.
+  // have to search the context chain to find the global context.
   ASSERT(Isolate::Current()->bootstrapper()->IsActive());
   Context* current = this;
-  while (!current->IsNativeContext()) {
+  while (!current->IsGlobalContext()) {
     JSFunction* closure = JSFunction::cast(current->closure());
     current = Context::cast(closure->context());
   }
   return current;
 }
 
 
 JSObject* Context::global_proxy() {
-  return native_context()->global_proxy_object();
+  return global_context()->global_proxy_object();
 }
 
 void Context::set_global_proxy(JSObject* object) {
-  native_context()->set_global_proxy_object(object);
+  global_context()->set_global_proxy_object(object);
 }
 
 
 Handle<Object> Context::Lookup(Handle<String> name,
                                ContextLookupFlags flags,
                                int* index,
                                PropertyAttributes* attributes,
                                BindingFlags* binding_flags) {
   Isolate* isolate = GetIsolate();
   Handle<Context> context(this, isolate);
 
   bool follow_context_chain = (flags & FOLLOW_CONTEXT_CHAIN) != 0;
   *index = -1;
   *attributes = ABSENT;
   *binding_flags = MISSING_BINDING;
 
   if (FLAG_trace_contexts) {
     PrintF("Context::Lookup(");
     name->ShortPrint();
     PrintF(")\n");
   }
 
   do {
     if (FLAG_trace_contexts) {
       PrintF(" - looking in context %p", reinterpret_cast<void*>(*context));
-      if (context->IsNativeContext()) PrintF(" (native context)");
+      if (context->IsGlobalContext()) PrintF(" (global context)");
       PrintF("\n");
     }
 
     // 1. Check global objects, subjects of with, and extension objects.
-    if (context->IsNativeContext() ||
+    if (context->IsGlobalContext() ||
         context->IsWithContext() ||
         (context->IsFunctionContext() && context->has_extension())) {
       Handle<JSObject> object(JSObject::cast(context->extension()), isolate);
       // Context extension objects needs to behave as if they have no
       // prototype.  So even if we want to follow prototype chains, we need
       // to only do a local lookup for context extension objects.
       if ((flags & FOLLOW_PROTOTYPE_CHAIN) == 0 ||
           object->IsJSContextExtensionObject()) {
         *attributes = object->GetLocalPropertyAttribute(*name);
       } else {
@@ skipping 94 matching lines @@
           PrintF("=> found in catch context\n");
         }
         *index = Context::THROWN_OBJECT_INDEX;
         *attributes = NONE;
         *binding_flags = MUTABLE_IS_INITIALIZED;
         return context;
       }
     }
 
     // 3. Prepare to continue with the previous (next outermost) context.
-    if (context->IsNativeContext()) {
+    if (context->IsGlobalContext()) {
       follow_context_chain = false;
     } else {
       context = Handle<Context>(context->previous(), isolate);
     }
   } while (follow_context_chain);
 
   if (FLAG_trace_contexts) {
     PrintF("=> no property/slot found\n");
   }
   return Handle<Object>::null();
 }
 
 
 void Context::AddOptimizedFunction(JSFunction* function) {
-  ASSERT(IsNativeContext());
+  ASSERT(IsGlobalContext());
 #ifdef DEBUG
   if (FLAG_enable_slow_asserts) {
     Object* element = get(OPTIMIZED_FUNCTIONS_LIST);
     while (!element->IsUndefined()) {
       CHECK(element != function);
       element = JSFunction::cast(element)->next_function_link();
     }
   }
 
   CHECK(function->next_function_link()->IsUndefined());
 
-  // Check that the context belongs to the weak native contexts list.
+  // Check that the context belongs to the weak global contexts list.
   bool found = false;
-  Object* context = GetHeap()->native_contexts_list();
+  Object* context = GetHeap()->global_contexts_list();
   while (!context->IsUndefined()) {
     if (context == this) {
       found = true;
       break;
     }
     context = Context::cast(context)->get(Context::NEXT_CONTEXT_LINK);
   }
   CHECK(found);
 #endif
   function->set_next_function_link(get(OPTIMIZED_FUNCTIONS_LIST));
   set(OPTIMIZED_FUNCTIONS_LIST, function);
 }
 
 
 void Context::RemoveOptimizedFunction(JSFunction* function) {
-  ASSERT(IsNativeContext());
+  ASSERT(IsGlobalContext());
   Object* element = get(OPTIMIZED_FUNCTIONS_LIST);
   JSFunction* prev = NULL;
   while (!element->IsUndefined()) {
     JSFunction* element_function = JSFunction::cast(element);
     ASSERT(element_function->next_function_link()->IsUndefined() ||
            element_function->next_function_link()->IsJSFunction());
     if (element_function == function) {
       if (prev == NULL) {
         set(OPTIMIZED_FUNCTIONS_LIST, element_function->next_function_link());
       } else {
         prev->set_next_function_link(element_function->next_function_link());
       }
       element_function->set_next_function_link(GetHeap()->undefined_value());
       return;
     }
     prev = element_function;
     element = element_function->next_function_link();
   }
   UNREACHABLE();
 }
 
 
 Object* Context::OptimizedFunctionsListHead() {
-  ASSERT(IsNativeContext());
+  ASSERT(IsGlobalContext());
   return get(OPTIMIZED_FUNCTIONS_LIST);
 }
 
 
 void Context::ClearOptimizedFunctions() {
   set(OPTIMIZED_FUNCTIONS_LIST, GetHeap()->undefined_value());
 }
 
 
 #ifdef DEBUG
 bool Context::IsBootstrappingOrValidParentContext(
     Object* object, Context* child) {
   // During bootstrapping we allow all objects to pass as
   // contexts. This is necessary to fix circular dependencies.
   if (Isolate::Current()->bootstrapper()->IsActive()) return true;
   if (!object->IsContext()) return false;
   Context* context = Context::cast(object);
-  return context->IsNativeContext() || context->IsModuleContext() ||
+  return context->IsGlobalContext() || context->IsModuleContext() ||
          !child->IsModuleContext();
 }
 
 
 bool Context::IsBootstrappingOrGlobalObject(Object* object) {
   // During bootstrapping we allow all objects to pass as global
   // objects. This is necessary to fix circular dependencies.
   Isolate* isolate = Isolate::Current();
   return isolate->heap()->gc_state() != Heap::NOT_IN_GC ||
       isolate->bootstrapper()->IsActive() ||
       object->IsGlobalObject();
 }
 #endif
 
 } }  // namespace v8::internal