Revert to code state of 3.13.1 plus r12350

src/objects-visiting.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 36 matching lines @@
 class StaticVisitorBase : public AllStatic {
  public:
 #define VISITOR_ID_LIST(V)    \
   V(SeqAsciiString)           \
   V(SeqTwoByteString)         \
   V(ShortcutCandidate)        \
   V(ByteArray)                \
   V(FreeSpace)                \
   V(FixedArray)               \
   V(FixedDoubleArray)         \
-  V(NativeContext)            \
+  V(GlobalContext)            \
   V(DataObject2)              \
   V(DataObject3)              \
   V(DataObject4)              \
   V(DataObject5)              \
   V(DataObject6)              \
   V(DataObject7)              \
   V(DataObject8)              \
   V(DataObject9)              \
   V(DataObjectGeneric)        \
   V(JSObject2)                \
@@ skipping 320 matching lines @@
 
   static inline void VisitCodeEntry(Heap* heap, Address entry_address);
   static inline void VisitEmbeddedPointer(Heap* heap, RelocInfo* rinfo);
   static inline void VisitGlobalPropertyCell(Heap* heap, RelocInfo* rinfo);
   static inline void VisitDebugTarget(Heap* heap, RelocInfo* rinfo);
   static inline void VisitCodeTarget(Heap* heap, RelocInfo* rinfo);
   static inline void VisitExternalReference(RelocInfo* rinfo) { }
   static inline void VisitRuntimeEntry(RelocInfo* rinfo) { }
 
   // TODO(mstarzinger): This should be made protected once refactoring is done.
-  static inline void VisitNativeContext(Map* map, HeapObject* object);
+  static inline void VisitGlobalContext(Map* map, HeapObject* object);
 
  protected:
   static inline void VisitCode(Map* map, HeapObject* object);
   static inline void VisitJSRegExp(Map* map, HeapObject* object);
 
   class DataObjectVisitor {
    public:
     template<int size>
     static inline void VisitSpecialized(Map* map, HeapObject* object) {
     }
@@ skipping 17 matching lines @@
 
 
 template<typename StaticVisitor>
 VisitorDispatchTable<typename StaticMarkingVisitor<StaticVisitor>::Callback>
     StaticMarkingVisitor<StaticVisitor>::table_;
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_VISITING_H_