| Index: src/arm/ic-arm.cc
|
| diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc
|
| index 29a3687aa975c39f31073f8e6fbbb4aed9055427..5e17694b76ccc57f5fcf9fab9bfe61eaae34e0f8 100644
|
| --- a/src/arm/ic-arm.cc
|
| +++ b/src/arm/ic-arm.cc
|
| @@ -862,7 +862,7 @@ void KeyedLoadIC::GenerateNonStrictArguments(MacroAssembler* masm) {
|
| __ mov(r0, r2);
|
| __ Ret();
|
| __ bind(&slow);
|
| - GenerateMiss(masm, false);
|
| + GenerateMiss(masm, MISS);
|
| }
|
|
|
|
|
| @@ -891,7 +891,7 @@ void KeyedStoreIC::GenerateNonStrictArguments(MacroAssembler* masm) {
|
| __ RecordWrite(r3, r6, r9, kLRHasNotBeenSaved, kDontSaveFPRegs);
|
| __ Ret();
|
| __ bind(&slow);
|
| - GenerateMiss(masm, false);
|
| + GenerateMiss(masm, MISS);
|
| }
|
|
|
|
|
| @@ -925,7 +925,7 @@ void KeyedCallIC::GenerateNonStrictArguments(MacroAssembler* masm,
|
| Object* KeyedLoadIC_Miss(Arguments args);
|
|
|
|
|
| -void KeyedLoadIC::GenerateMiss(MacroAssembler* masm, bool force_generic) {
|
| +void KeyedLoadIC::GenerateMiss(MacroAssembler* masm, ICMissMode miss_mode) {
|
| // ---------- S t a t e --------------
|
| // -- lr : return address
|
| // -- r0 : key
|
| @@ -938,7 +938,7 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm, bool force_generic) {
|
| __ Push(r1, r0);
|
|
|
| // Perform tail call to the entry.
|
| - ExternalReference ref = force_generic
|
| + ExternalReference ref = miss_mode == MISS_FORCE_GENERIC
|
| ? ExternalReference(IC_Utility(kKeyedLoadIC_MissForceGeneric), isolate)
|
| : ExternalReference(IC_Utility(kKeyedLoadIC_Miss), isolate);
|
|
|
| @@ -1158,7 +1158,7 @@ void KeyedLoadIC::GenerateString(MacroAssembler* masm) {
|
| char_at_generator.GenerateSlow(masm, call_helper);
|
|
|
| __ bind(&miss);
|
| - GenerateMiss(masm, false);
|
| + GenerateMiss(masm, MISS);
|
| }
|
|
|
|
|
| @@ -1198,11 +1198,11 @@ void KeyedLoadIC::GenerateIndexedInterceptor(MacroAssembler* masm) {
|
| 1);
|
|
|
| __ bind(&slow);
|
| - GenerateMiss(masm, false);
|
| + GenerateMiss(masm, MISS);
|
| }
|
|
|
|
|
| -void KeyedStoreIC::GenerateMiss(MacroAssembler* masm, bool force_generic) {
|
| +void KeyedStoreIC::GenerateMiss(MacroAssembler* masm, ICMissMode miss_mode) {
|
| // ---------- S t a t e --------------
|
| // -- r0 : value
|
| // -- r1 : key
|
| @@ -1213,7 +1213,7 @@ void KeyedStoreIC::GenerateMiss(MacroAssembler* masm, bool force_generic) {
|
| // Push receiver, key and value for runtime call.
|
| __ Push(r2, r1, r0);
|
|
|
| - ExternalReference ref = force_generic
|
| + ExternalReference ref = miss_mode == MISS_FORCE_GENERIC
|
| ? ExternalReference(IC_Utility(kKeyedStoreIC_MissForceGeneric),
|
| masm->isolate())
|
| : ExternalReference(IC_Utility(kKeyedStoreIC_Miss), masm->isolate());
|
|
|