Revert to code state of 3.13.1 plus r12350

src/type-info.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 217 matching lines @@
 class Expression;
 class Property;
 class SmallMapList;
 class UnaryOperation;
 class ForInStatement;
 
 
 class TypeFeedbackOracle: public ZoneObject {
  public:
   TypeFeedbackOracle(Handle<Code> code,
-                     Handle<Context> native_context,
+                     Handle<Context> global_context,
                      Isolate* isolate,
                      Zone* zone);
 
   bool LoadIsMonomorphicNormal(Property* expr);
   bool LoadIsUninitialized(Property* expr);
   bool LoadIsMegamorphicWithTypeInfo(Property* expr);
   bool StoreIsMonomorphicNormal(TypeFeedbackId ast_id);
   bool StoreIsMegamorphicWithTypeInfo(TypeFeedbackId ast_id);
   bool CallIsMonomorphic(Call* expr);
   bool CallNewIsMonomorphic(CallNew* expr);
@@ skipping 10 matching lines @@
   void StoreReceiverTypes(Assignment* expr,
                           Handle<String> name,
                           SmallMapList* types);
   void CallReceiverTypes(Call* expr,
                          Handle<String> name,
                          CallKind call_kind,
                          SmallMapList* types);
   void CollectKeyedReceiverTypes(TypeFeedbackId ast_id,
                                  SmallMapList* types);
 
-  static bool CanRetainOtherContext(Map* map, Context* native_context);
+  static bool CanRetainOtherContext(Map* map, Context* global_context);
   static bool CanRetainOtherContext(JSFunction* function,
-                                    Context* native_context);
+                                    Context* global_context);
 
   CheckType GetCallCheckType(Call* expr);
   Handle<JSObject> GetPrototypeForPrimitiveCheck(CheckType check);
 
   Handle<JSFunction> GetCallTarget(Call* expr);
   Handle<JSFunction> GetCallNewTarget(CallNew* expr);
 
   Handle<Map> GetObjectLiteralStoreMap(ObjectLiteral::Property* prop);
 
   bool LoadIsBuiltin(Property* expr, Builtins::Name id);
@@ skipping 28 matching lines @@
   void RelocateRelocInfos(ZoneList<RelocInfo>* infos,
                           byte* old_start,
                           byte* new_start);
   void ProcessRelocInfos(ZoneList<RelocInfo>* infos);
   void ProcessTypeFeedbackCells(Handle<Code> code);
 
   // Returns an element from the backing store. Returns undefined if
   // there is no information.
   Handle<Object> GetInfo(TypeFeedbackId ast_id);
 
-  Handle<Context> native_context_;
+  Handle<Context> global_context_;
   Isolate* isolate_;
   Handle<UnseededNumberDictionary> dictionary_;
   Zone* zone_;
 
   DISALLOW_COPY_AND_ASSIGN(TypeFeedbackOracle);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_TYPE_INFO_H_