| Index: src/arm/stub-cache-arm.cc | 
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc | 
| index 4d9fc0de036991159a6d9f422bd19b84bac4737c..8b80368549f5fe1d0cd2988251f8e3ac686e8431 100644 | 
| --- a/src/arm/stub-cache-arm.cc | 
| +++ b/src/arm/stub-cache-arm.cc | 
| @@ -1120,7 +1120,7 @@ void StubCompiler::GenerateTailCall(MacroAssembler* masm, Handle<Code> code) { | 
| #define __ ACCESS_MASM(masm()) | 
|  | 
|  | 
| -Register StubCompiler::CheckPrototypes(Handle<Type> type, | 
| +Register StubCompiler::CheckPrototypes(Handle<HeapType> type, | 
| Register object_reg, | 
| Handle<JSObject> holder, | 
| Register holder_reg, | 
| @@ -1266,7 +1266,7 @@ void StoreStubCompiler::HandlerFrontendFooter(Handle<Name> name, Label* miss) { | 
|  | 
|  | 
| Register LoadStubCompiler::CallbackHandlerFrontend( | 
| -    Handle<Type> type, | 
| +    Handle<HeapType> type, | 
| Register object_reg, | 
| Handle<JSObject> holder, | 
| Handle<Name> name, | 
| @@ -2638,7 +2638,7 @@ Handle<Code> StoreStubCompiler::CompileStoreInterceptor( | 
| } | 
|  | 
|  | 
| -Handle<Code> LoadStubCompiler::CompileLoadNonexistent(Handle<Type> type, | 
| +Handle<Code> LoadStubCompiler::CompileLoadNonexistent(Handle<HeapType> type, | 
| Handle<JSObject> last, | 
| Handle<Name> name) { | 
| NonexistentHandlerFrontend(type, last, name); | 
| @@ -2737,7 +2737,7 @@ void LoadStubCompiler::GenerateLoadViaGetter(MacroAssembler* masm, | 
|  | 
|  | 
| Handle<Code> LoadStubCompiler::CompileLoadGlobal( | 
| -    Handle<Type> type, | 
| +    Handle<HeapType> type, | 
| Handle<GlobalObject> global, | 
| Handle<PropertyCell> cell, | 
| Handle<Name> name, | 
| @@ -2791,13 +2791,13 @@ Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC( | 
| int number_of_handled_maps = 0; | 
| __ ldr(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset)); | 
| for (int current = 0; current < receiver_count; ++current) { | 
| -    Handle<Type> type = types->at(current); | 
| +    Handle<HeapType> type = types->at(current); | 
| Handle<Map> map = IC::TypeToMap(*type, isolate()); | 
| if (!map->is_deprecated()) { | 
| number_of_handled_maps++; | 
| __ mov(ip, Operand(map)); | 
| __ cmp(map_reg, ip); | 
| -      if (type->Is(Type::Number())) { | 
| +      if (type->Is(HeapType::Number())) { | 
| ASSERT(!number_case.is_unused()); | 
| __ bind(&number_case); | 
| } | 
|  |