Stop using HeapType in IC and Crankshaft

src/ic/ic-compiler.h

Index: src/ic/ic-compiler.h
diff --git a/src/ic/ic-compiler.h b/src/ic/ic-compiler.h
index 41d901a358b57bf05176ca36c63e620a104acbc3..d1bd7a1dfcb6f6808c94371b8495a1276526cd87 100644
--- a/src/ic/ic-compiler.h
+++ b/src/ic/ic-compiler.h
@@ -24,10 +24,9 @@ class PropertyICCompiler : public PropertyAccessCompiler {
                                    ExtraICState extra_state);
 
   static Handle<Code> ComputeMonomorphic(Code::Kind kind, Handle<Name> name,
-                                         Handle<HeapType> type,
-                                         Handle<Code> handler,
+                                         Handle<Map> map, Handle<Code> handler,
                                          ExtraICState extra_ic_state);
-  static Handle<Code> ComputePolymorphic(Code::Kind kind, TypeHandleList* types,
+  static Handle<Code> ComputePolymorphic(Code::Kind kind, MapHandleList* maps,
                                          CodeHandleList* handlers,
                                          int number_of_valid_maps,
                                          Handle<Name> name,
@@ -76,11 +75,11 @@ class PropertyICCompiler : public PropertyAccessCompiler {
   Handle<Code> CompileStoreGeneric(Code::Flags flags);
   Handle<Code> CompileStoreMegamorphic(Code::Flags flags);
 
-  Handle<Code> CompileMonomorphic(Handle<HeapType> type, Handle<Code> handler,
+  Handle<Code> CompileMonomorphic(Handle<Map> map, Handle<Code> handler,
                                   Handle<Name> name, IcCheckType check);
-  Handle<Code> CompilePolymorphic(TypeHandleList* types,
-                                  CodeHandleList* handlers, Handle<Name> name,
-                                  Code::StubType type, IcCheckType check);
+  Handle<Code> CompilePolymorphic(MapHandleList* maps, CodeHandleList* handlers,
+                                  Handle<Name> name, Code::StubType type,
+                                  IcCheckType check);
 
   Handle<Code> CompileKeyedStoreMonomorphic(Handle<Map> receiver_map,
                                             KeyedAccessStoreMode store_mode);
@@ -90,7 +89,7 @@ class PropertyICCompiler : public PropertyAccessCompiler {
                                             CodeHandleList* handler_stubs,
                                             MapHandleList* transitioned_maps);
 
-  bool IncludesNumberType(TypeHandleList* types);
+  bool IncludesNumberMap(MapHandleList* maps);
 
   Handle<Code> GetCode(Code::Kind kind, Code::StubType type, Handle<Name> name,
                        InlineCacheState state = MONOMORPHIC);