Revert to code state of 3.13.1 plus r12350

src/liveobjectlist.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 56 matching lines @@
   v(InterceptorInfo, "unexpected: InterceptorInfo") \
   v(AccessCheckInfo, "unexpected: AccessCheckInfo") \
   v(AccessorInfo, "unexpected: AccessorInfo") \
   v(ExternalTwoByteString, "unexpected: ExternalTwoByteString") \
   v(ExternalAsciiString, "unexpected: ExternalAsciiString") \
   v(ExternalString, "unexpected: ExternalString") \
   v(SeqTwoByteString, "unexpected: SeqTwoByteString") \
   v(SeqAsciiString, "unexpected: SeqAsciiString") \
   v(SeqString, "unexpected: SeqString") \
   v(JSFunctionResultCache, "unexpected: JSFunctionResultCache") \
-  v(NativeContext, "unexpected: NativeContext") \
+  v(GlobalContext, "unexpected: GlobalContext") \
   v(MapCache, "unexpected: MapCache") \
   v(CodeCacheHashTable, "unexpected: CodeCacheHashTable") \
   v(CompilationCacheTable, "unexpected: CompilationCacheTable") \
   v(SymbolTable, "unexpected: SymbolTable") \
   v(Dictionary, "unexpected: Dictionary") \
   v(HashTable, "unexpected: HashTable") \
   v(DescriptorArray, "unexpected: DescriptorArray") \
   v(ExternalFloatArray, "unexpected: ExternalFloatArray") \
   v(ExternalUnsignedIntArray, "unexpected: ExternalUnsignedIntArray") \
   v(ExternalIntArray, "unexpected: ExternalIntArray") \
@@ skipping 1856 matching lines @@
   // Get the target object.
   HeapObject* heap_obj = HeapObject::cast(GetObj(obj_id));
   if (heap_obj == heap->undefined_value()) {
     return heap_obj;
   }
 
   Handle<HeapObject> target = Handle<HeapObject>(heap_obj);
 
   // Get the constructor function for context extension and arguments array.
   JSObject* arguments_boilerplate =
-      isolate->context()->native_context()->arguments_boilerplate();
+      isolate->context()->global_context()->arguments_boilerplate();
   JSFunction* arguments_function =
       JSFunction::cast(arguments_boilerplate->map()->constructor());
 
   Handle<JSFunction> args_function = Handle<JSFunction>(arguments_function);
   LolFilter filter(filter_obj);
 
   if (!verbose) {
     RetainersSummaryWriter writer(target, instance_filter, args_function);
     return SummarizePrivate(&writer, &filter, true);
 
@@ skipping 657 matching lines @@
                 i++, heap_obj, Heap::new_space()->FromSpaceStart());
     }
   }
 }
 #endif  // VERIFY_LOL
 
 
 } }  // namespace v8::internal
 
 #endif  // LIVE_OBJECT_LIST