| Index: src/x64/stub-cache-x64.cc
|
| diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
|
| index 431bf471071aefa7d51e9591fe16dffa506928ab..a1e8f211161e9c42cbfeffa0f9d9d3eb9818bcae 100644
|
| --- a/src/x64/stub-cache-x64.cc
|
| +++ b/src/x64/stub-cache-x64.cc
|
| @@ -3068,7 +3068,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(
|
|
|
|
|
| Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC(
|
| - MapHandleList* receiver_maps,
|
| + TypeHandleList* types,
|
| CodeHandleList* handlers,
|
| Handle<Name> name,
|
| Code::StubType type,
|
| @@ -3080,21 +3080,21 @@ 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();
|
| __ movq(map_reg, FieldOperand(receiver(), HeapObject::kMapOffset));
|
| - int receiver_count = receiver_maps->length();
|
| + int receiver_count = types->length();
|
| int number_of_handled_maps = 0;
|
| - 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++;
|
| // Check map and tail call if there's a match
|
| - __ Cmp(map_reg, receiver_maps->at(current));
|
| - if (map.is_identical_to(heap_number_map)) {
|
| + __ Cmp(map_reg, map);
|
| + if (type->Is(Type::Number())) {
|
| ASSERT(!number_case.is_unused());
|
| __ bind(&number_case);
|
| }
|
|
|