Revert to code state of 3.13.1 plus r12350

src/mark-compact.cc

 // 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 206 matching lines @@
   VerifyEvacuation(heap->code_space());
   VerifyEvacuation(heap->cell_space());
   VerifyEvacuation(heap->map_space());
   VerifyEvacuation(heap->new_space());
 
   VerifyEvacuationVisitor visitor;
   heap->IterateStrongRoots(&visitor, VISIT_ALL);
 }
 
 
-class VerifyNativeContextSeparationVisitor: public ObjectVisitor {
+class VerifyGlobalContextSeparationVisitor: public ObjectVisitor {
  public:
-  VerifyNativeContextSeparationVisitor() : current_native_context_(NULL) {}
+  VerifyGlobalContextSeparationVisitor() : current_global_context_(NULL) {}
 
   void VisitPointers(Object** start, Object** end) {
     for (Object** current = start; current < end; current++) {
       if ((*current)->IsHeapObject()) {
         HeapObject* object = HeapObject::cast(*current);
         if (object->IsString()) continue;
         switch (object->map()->instance_type()) {
           case JS_FUNCTION_TYPE:
             CheckContext(JSFunction::cast(object)->context());
             break;
           case JS_GLOBAL_PROXY_TYPE:
-            CheckContext(JSGlobalProxy::cast(object)->native_context());
+            CheckContext(JSGlobalProxy::cast(object)->context());
             break;
           case JS_GLOBAL_OBJECT_TYPE:
           case JS_BUILTINS_OBJECT_TYPE:
-            CheckContext(GlobalObject::cast(object)->native_context());
+            CheckContext(GlobalObject::cast(object)->global_context());
             break;
           case JS_ARRAY_TYPE:
           case JS_DATE_TYPE:
           case JS_OBJECT_TYPE:
           case JS_REGEXP_TYPE:
             VisitPointer(HeapObject::RawField(object, JSObject::kMapOffset));
             break;
           case MAP_TYPE:
             VisitPointer(HeapObject::RawField(object, Map::kPrototypeOffset));
             VisitPointer(HeapObject::RawField(object, Map::kConstructorOffset));
@@ skipping 32 matching lines @@
           default:
             UNREACHABLE();
         }
       }
     }
   }
 
  private:
   void CheckContext(Object* context) {
     if (!context->IsContext()) return;
-    Context* native_context = Context::cast(context)->native_context();
-    if (current_native_context_ == NULL) {
-      current_native_context_ = native_context;
+    Context* global_context = Context::cast(context)->global_context();
+    if (current_global_context_ == NULL) {
+      current_global_context_ = global_context;
     } else {
-      CHECK_EQ(current_native_context_, native_context);
+      CHECK_EQ(current_global_context_, global_context);
     }
   }
 
-  Context* current_native_context_;
+  Context* current_global_context_;
 };
 
 
-static void VerifyNativeContextSeparation(Heap* heap) {
+static void VerifyGlobalContextSeparation(Heap* heap) {
   HeapObjectIterator it(heap->code_space());
 
   for (Object* object = it.Next(); object != NULL; object = it.Next()) {
-    VerifyNativeContextSeparationVisitor visitor;
+    VerifyGlobalContextSeparationVisitor visitor;
     Code::cast(object)->CodeIterateBody(&visitor);
   }
 }
 #endif
 
 
 void MarkCompactCollector::AddEvacuationCandidate(Page* p) {
   p->MarkEvacuationCandidate();
   evacuation_candidates_.Add(p);
 }
@@ skipping 57 matching lines @@
   if (FLAG_verify_heap) {
     VerifyMarking(heap_);
   }
 #endif
 
   SweepSpaces();
 
   if (!FLAG_collect_maps) ReattachInitialMaps();
 
 #ifdef DEBUG
-  if (FLAG_verify_native_context_separation) {
-    VerifyNativeContextSeparation(heap_);
+  if (FLAG_verify_global_context_separation) {
+    VerifyGlobalContextSeparation(heap_);
   }
 #endif
 
   Finish();
 
   tracer_ = NULL;
 }
 
 
 #ifdef DEBUG
@@ skipping 858 matching lines @@
     // decision until we see all functions that point to the same
     // SharedFunctionInfo because some of them might be optimized.
     // That would make the nonoptimized version of the code nonflushable,
     // because it is required for bailing out from optimized code.
     heap->mark_compact_collector()->code_flusher()->AddCandidate(function);
     return true;
   }
 
   static inline bool IsValidNotBuiltinContext(Object* ctx) {
     return ctx->IsContext() &&
-        !Context::cast(ctx)->global_object()->IsJSBuiltinsObject();
+        !Context::cast(ctx)->global()->IsJSBuiltinsObject();
   }
 
 
   static void VisitSharedFunctionInfoGeneric(Map* map, HeapObject* object) {
     SharedFunctionInfo::cast(object)->BeforeVisitingPointers();
 
     FixedBodyVisitor<MarkCompactMarkingVisitor,
                      SharedFunctionInfo::BodyDescriptor,
                      void>::Visit(map, object);
   }
@@ skipping 1133 matching lines @@
     heap()->isolate()->runtime_profiler()->RemoveDeadSamples();
   }
 
   if (FLAG_track_gc_object_stats) {
     heap()->CheckpointObjectStats();
   }
 }
 
 
 void MarkCompactCollector::ProcessMapCaches() {
-  Object* raw_context = heap()->native_contexts_list_;
+  Object* raw_context = heap()->global_contexts_list_;
   while (raw_context != heap()->undefined_value()) {
     Context* context = reinterpret_cast<Context*>(raw_context);
     if (IsMarked(context)) {
       HeapObject* raw_map_cache =
           HeapObject::cast(context->get(Context::MAP_CACHE_INDEX));
       // A map cache may be reachable from the stack. In this case
       // it's already transitively marked and it's too late to clean
       // up its parts.
       if (!IsMarked(raw_map_cache) &&
           raw_map_cache != heap()->undefined_value()) {
@@ skipping 960 matching lines @@
        cell != NULL;
        cell = cell_iterator.Next()) {
     if (cell->IsJSGlobalPropertyCell()) {
       Address value_address =
           reinterpret_cast<Address>(cell) +
           (JSGlobalPropertyCell::kValueOffset - kHeapObjectTag);
       updating_visitor.VisitPointer(reinterpret_cast<Object**>(value_address));
     }
   }
 
-  // Update pointer from the native contexts list.
-  updating_visitor.VisitPointer(heap_->native_contexts_list_address());
+  // Update pointer from the global contexts list.
+  updating_visitor.VisitPointer(heap_->global_contexts_list_address());
 
   heap_->symbol_table()->Iterate(&updating_visitor);
 
   // Update pointers from external string table.
   heap_->UpdateReferencesInExternalStringTable(
       &UpdateReferenceInExternalStringTableEntry);
 
   if (!FLAG_watch_ic_patching) {
     // Update JSFunction pointers from the runtime profiler.
     heap()->isolate()->runtime_profiler()->UpdateSamplesAfterCompact(
@@ skipping 723 matching lines @@
   while (buffer != NULL) {
     SlotsBuffer* next_buffer = buffer->next();
     DeallocateBuffer(buffer);
     buffer = next_buffer;
   }
   *buffer_address = NULL;
 }
 
 
 } }  // namespace v8::internal