Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index 9f3e0790ea53a7b68b8ac71bb943a14925d67564..2e3a0f8a3e4744294be395792901f5eaff001c4d 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -3051,7 +3051,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal( |
Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC( |
- MapHandleList* receiver_maps, |
+ TypeHandleList* types, |
CodeHandleList* handlers, |
Handle<Name> name, |
Code::StubType type, |
@@ -3063,22 +3063,22 @@ Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC( |
} |
Label number_case; |
- Label* smi_target = HasHeapNumberMap(receiver_maps) ? &number_case : &miss; |
+ Label* smi_target = IncludesNumberType(types) ? &number_case : &miss; |
__ JumpIfSmi(receiver(), smi_target); |
Register map_reg = scratch1(); |
- int receiver_count = receiver_maps->length(); |
+ int receiver_count = types->length(); |
int number_of_handled_maps = 0; |
__ ldr(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset)); |
- Handle<Map> heap_number_map = isolate()->factory()->heap_number_map(); |
for (int current = 0; current < receiver_count; ++current) { |
- Handle<Map> map = receiver_maps->at(current); |
+ Handle<Type> type = types->at(current); |
+ Handle<Map> map = IC::TypeToMap(*type, isolate()); |
if (!map->is_deprecated()) { |
number_of_handled_maps++; |
- __ mov(ip, Operand(receiver_maps->at(current))); |
+ __ mov(ip, Operand(map)); |
__ cmp(map_reg, ip); |
- if (map.is_identical_to(heap_number_map)) { |
+ if (type->Is(Type::Number())) { |
ASSERT(!number_case.is_unused()); |
__ bind(&number_case); |
} |