Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch.

src/type-info.h

Index: src/type-info.h
===================================================================
--- src/type-info.h	(revision 7180)
+++ src/type-info.h	(working copy)
@@ -249,6 +249,9 @@
   ZoneMapList* StoreReceiverTypes(Assignment* expr, Handle<String> name);
   ZoneMapList* CallReceiverTypes(Call* expr, Handle<String> name);
 
+  ExternalArrayType GetKeyedLoadExternalArrayType(Property* expr);
+  ExternalArrayType GetKeyedStoreExternalArrayType(Assignment* expr);
+
   CheckType GetCallCheckType(Call* expr);
   Handle<JSObject> GetPrototypeForPrimitiveCheck(CheckType check);
 
@@ -260,8 +263,6 @@
   TypeInfo SwitchType(CaseClause* clause);
 
  private:
-  void Initialize(Handle<Code> code);
-
   ZoneMapList* CollectReceiverTypes(int position,
                                     Handle<String> name,
                                     Code::Flags flags);
@@ -272,8 +273,12 @@
                         List<int>* code_positions,
                         List<int>* source_positions);
 
+  // Returns an element from the backing store. Returns undefined if
+  // there is no information.
+  Handle<Object> GetInfo(int pos);
+
   Handle<Context> global_context_;
-  Handle<JSObject> map_;
+  Handle<NumberDictionary> dictionary_;
 
   DISALLOW_COPY_AND_ASSIGN(TypeFeedbackOracle);
 };