diff options
Diffstat (limited to 'deps/v8/src/ic/arm/ic-compiler-arm.cc')
| -rw-r--r-- | deps/v8/src/ic/arm/ic-compiler-arm.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/deps/v8/src/ic/arm/ic-compiler-arm.cc b/deps/v8/src/ic/arm/ic-compiler-arm.cc index b44702ba3d..c5c0b7057e 100644 --- a/deps/v8/src/ic/arm/ic-compiler-arm.cc +++ b/deps/v8/src/ic/arm/ic-compiler-arm.cc @@ -15,12 +15,12 @@ namespace internal { #define __ ACCESS_MASM(masm) -void PropertyICCompiler::GenerateRuntimeSetProperty(MacroAssembler* masm, - StrictMode strict_mode) { +void PropertyICCompiler::GenerateRuntimeSetProperty( + MacroAssembler* masm, LanguageMode language_mode) { __ Push(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister(), StoreDescriptor::ValueRegister()); - __ mov(r0, Operand(Smi::FromInt(strict_mode))); + __ mov(r0, Operand(Smi::FromInt(language_mode))); __ Push(r0); // Do tail-call to runtime routine. @@ -32,7 +32,7 @@ void PropertyICCompiler::GenerateRuntimeSetProperty(MacroAssembler* masm, #define __ ACCESS_MASM(masm()) -Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types, +Handle<Code> PropertyICCompiler::CompilePolymorphic(MapHandleList* maps, CodeHandleList* handlers, Handle<Name> name, Code::StubType type, @@ -59,7 +59,7 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types, } Label number_case; - Label* smi_target = IncludesNumberType(types) ? &number_case : &miss; + Label* smi_target = IncludesNumberMap(maps) ? &number_case : &miss; __ JumpIfSmi(receiver(), smi_target); // Polymorphic keyed stores may use the map register @@ -67,17 +67,16 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types, DCHECK(kind() != Code::KEYED_STORE_IC || map_reg.is(ElementTransitionAndStoreDescriptor::MapRegister())); - int receiver_count = types->length(); + int receiver_count = maps->length(); int number_of_handled_maps = 0; __ ldr(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset)); for (int current = 0; current < receiver_count; ++current) { - Handle<HeapType> type = types->at(current); - Handle<Map> map = IC::TypeToMap(*type, isolate()); + Handle<Map> map = maps->at(current); if (!map->is_deprecated()) { number_of_handled_maps++; Handle<WeakCell> cell = Map::WeakCellForMap(map); __ CmpWeakValue(map_reg, cell, scratch2()); - if (type->Is(HeapType::Number())) { + if (map->instance_type() == HEAP_NUMBER_TYPE) { DCHECK(!number_case.is_unused()); __ bind(&number_case); } |