Stop using HeapType in IC and Crankshaft

src/type-feedback-vector.h

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_TYPE_FEEDBACK_VECTOR_H_
 #define V8_TYPE_FEEDBACK_VECTOR_H_
 
 #include <vector>
 
 #include "src/checks.h"
@@ skipping 244 matching lines @@
 
  protected:
   Isolate* GetIsolate() const { return vector()->GetIsolate(); }
 
   void SetFeedback(Object* feedback,
                    WriteBarrierMode mode = UPDATE_WRITE_BARRIER) {
     vector()->Set(slot(), feedback, mode);
   }
 
   Handle<FixedArray> EnsureArrayOfSize(int length);
-  void InstallHandlers(int start_index, TypeHandleList* types,
+  void InstallHandlers(int start_index, MapHandleList* maps,
                        CodeHandleList* handlers);
   int ExtractMaps(int start_index, MapHandleList* maps) const;
   MaybeHandle<Code> FindHandlerForMap(int start_index, Handle<Map> map) const;
   bool FindHandlers(int start_index, CodeHandleList* code_list,
                     int length) const;
 
  private:
   // The reason for having a vector handle and a raw pointer is that we can and
   // should use handles during IC miss, but not during GC when we clear ICs. If
   // you have a handle to the vector that is better because more operations can
@@ skipping 46 matching lines @@
   }
   LoadICNexus(TypeFeedbackVector* vector, FeedbackVectorICSlot slot)
       : FeedbackNexus(vector, slot) {
     DCHECK(vector->GetKind(slot) == Code::LOAD_IC);
   }
 
   void Clear(Code* host);
 
   void ConfigureMegamorphic();
   void ConfigurePremonomorphic();
-  void ConfigureMonomorphic(Handle<HeapType> type, Handle<Code> handler);
+  void ConfigureMonomorphic(Handle<Map> receiver_map, Handle<Code> handler);
 
-  void ConfigurePolymorphic(TypeHandleList* types, CodeHandleList* handlers);
+  void ConfigurePolymorphic(MapHandleList* maps, CodeHandleList* handlers);
 
   InlineCacheState StateFromFeedback() const OVERRIDE;
   int ExtractMaps(MapHandleList* maps) const OVERRIDE;
   MaybeHandle<Code> FindHandlerForMap(Handle<Map> map) const OVERRIDE;
   virtual bool FindHandlers(CodeHandleList* code_list,
                             int length = -1) const OVERRIDE;
 };
 
 
 class KeyedLoadICNexus : public FeedbackNexus {
  public:
   KeyedLoadICNexus(Handle<TypeFeedbackVector> vector, FeedbackVectorICSlot slot)
       : FeedbackNexus(vector, slot) {
     DCHECK(vector->GetKind(slot) == Code::KEYED_LOAD_IC);
   }
   KeyedLoadICNexus(TypeFeedbackVector* vector, FeedbackVectorICSlot slot)
       : FeedbackNexus(vector, slot) {
     DCHECK(vector->GetKind(slot) == Code::KEYED_LOAD_IC);
   }
 
   void Clear(Code* host);
 
   void ConfigureMegamorphic();
   void ConfigurePremonomorphic();
   // name can be a null handle for element loads.
-  void ConfigureMonomorphic(Handle<Name> name, Handle<HeapType> type,
+  void ConfigureMonomorphic(Handle<Name> name, Handle<Map> receiver_map,
                             Handle<Code> handler);
   // name can be null.
-  void ConfigurePolymorphic(Handle<Name> name, TypeHandleList* types,
+  void ConfigurePolymorphic(Handle<Name> name, MapHandleList* maps,
                             CodeHandleList* handlers);
 
   InlineCacheState StateFromFeedback() const OVERRIDE;
   int ExtractMaps(MapHandleList* maps) const OVERRIDE;
   MaybeHandle<Code> FindHandlerForMap(Handle<Map> map) const OVERRIDE;
   virtual bool FindHandlers(CodeHandleList* code_list,
                             int length = -1) const OVERRIDE;
   Name* FindFirstName() const OVERRIDE;
 };
 }
 }  // namespace v8::internal
 
 #endif  // V8_TRANSITIONS_H_