| Index: src/ic/mips64/ic-mips64.cc
|
| diff --git a/src/ic/mips64/ic-mips64.cc b/src/ic/mips64/ic-mips64.cc
|
| index fd0501a73a2b4491f8d243bca2178dcfb515176f..b4055b23679dbbab6d06aef112ed8afd7772ab6b 100644
|
| --- a/src/ic/mips64/ic-mips64.cc
|
| +++ b/src/ic/mips64/ic-mips64.cc
|
| @@ -599,7 +599,7 @@ void KeyedLoadIC::GenerateGeneric(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| -static void KeyedStoreGenerateGenericHelper(
|
| +static void KeyedStoreGenerateMegamorphicHelper(
|
| MacroAssembler* masm, Label* fast_object, Label* fast_double, Label* slow,
|
| KeyedStoreCheckMap check_map, KeyedStoreIncrementLength increment_length,
|
| Register value, Register key, Register receiver, Register receiver_map,
|
| @@ -749,9 +749,8 @@ static void KeyedStoreGenerateGenericHelper(
|
| }
|
|
|
|
|
| -void KeyedStoreIC::GenerateGeneric(
|
| - MacroAssembler* masm, StrictMode strict_mode,
|
| - KeyedStoreStubCacheRequirement handler_requirement) {
|
| +void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
|
| + StrictMode strict_mode) {
|
| // ---------- S t a t e --------------
|
| // -- a0 : value
|
| // -- a1 : key
|
| @@ -814,12 +813,7 @@ void KeyedStoreIC::GenerateGeneric(
|
| masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false, receiver,
|
| key, a3, a4, a5, a6);
|
| // Cache miss.
|
| - if (handler_requirement == kCallRuntimeOnMissingHandler) {
|
| - __ Branch(&slow);
|
| - } else {
|
| - DCHECK(handler_requirement == kMissOnMissingHandler);
|
| - __ Branch(&miss);
|
| - }
|
| + __ Branch(&miss);
|
|
|
| // Extra capacity case: Check if there is extra capacity to
|
| // perform the store and update the length. Used for adding one
|
| @@ -852,13 +846,13 @@ void KeyedStoreIC::GenerateGeneric(
|
| __ ld(a4, FieldMemOperand(receiver, JSArray::kLengthOffset));
|
| __ Branch(&extra, hs, key, Operand(a4));
|
|
|
| - KeyedStoreGenerateGenericHelper(
|
| + KeyedStoreGenerateMegamorphicHelper(
|
| masm, &fast_object, &fast_double, &slow, kCheckMap, kDontIncrementLength,
|
| value, key, receiver, receiver_map, elements_map, elements);
|
| - KeyedStoreGenerateGenericHelper(masm, &fast_object_grow, &fast_double_grow,
|
| - &slow, kDontCheckMap, kIncrementLength, value,
|
| - key, receiver, receiver_map, elements_map,
|
| - elements);
|
| + KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow,
|
| + &fast_double_grow, &slow, kDontCheckMap,
|
| + kIncrementLength, value, key, receiver,
|
| + receiver_map, elements_map, elements);
|
|
|
| __ bind(&miss);
|
| GenerateMiss(masm);
|
|
|