| Index: src/ic/mips64/ic-mips64.cc
|
| diff --git a/src/ic/mips64/ic-mips64.cc b/src/ic/mips64/ic-mips64.cc
|
| index 2d9ffe517b1bbd3e740e529fdc16d4a95cdc0145..770fa77808dd5ef7631d3aeefd2d3e051f914d54 100644
|
| --- a/src/ic/mips64/ic-mips64.cc
|
| +++ b/src/ic/mips64/ic-mips64.cc
|
| @@ -162,8 +162,7 @@ static void GenerateKeyedLoadReceiverCheck(MacroAssembler* masm,
|
| static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver,
|
| Register key, Register elements,
|
| Register scratch1, Register scratch2,
|
| - Register result, Label* slow,
|
| - LanguageMode language_mode) {
|
| + Register result, Label* slow) {
|
| // Register use:
|
| //
|
| // receiver - holds the receiver on entry.
|
| @@ -185,7 +184,7 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver,
|
| //
|
| // scratch2 - used to hold maps, prototypes, and the loaded value.
|
| Label check_prototypes, check_next_prototype;
|
| - Label done, in_bounds, absent;
|
| + Label done, in_bounds, return_undefined;
|
|
|
| __ ld(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ AssertFastElements(elements);
|
| @@ -203,7 +202,7 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver,
|
| __ ld(scratch2, FieldMemOperand(scratch2, Map::kPrototypeOffset));
|
| // scratch2: current prototype
|
| __ LoadRoot(at, Heap::kNullValueRootIndex);
|
| - __ Branch(&absent, eq, scratch2, Operand(at));
|
| + __ Branch(&return_undefined, eq, scratch2, Operand(at));
|
| __ ld(elements, FieldMemOperand(scratch2, JSObject::kElementsOffset));
|
| __ ld(scratch2, FieldMemOperand(scratch2, HeapObject::kMapOffset));
|
| // elements: elements of current prototype
|
| @@ -218,13 +217,9 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver,
|
| __ Branch(slow, ne, elements, Operand(at));
|
| __ Branch(&check_next_prototype);
|
|
|
| - __ bind(&absent);
|
| - if (is_strong(language_mode)) {
|
| - __ Branch(slow);
|
| - } else {
|
| - __ LoadRoot(result, Heap::kUndefinedValueRootIndex);
|
| - __ Branch(&done);
|
| - }
|
| + __ bind(&return_undefined);
|
| + __ LoadRoot(result, Heap::kUndefinedValueRootIndex);
|
| + __ Branch(&done);
|
|
|
| __ bind(&in_bounds);
|
| // Fast case: Do the load.
|
| @@ -288,7 +283,7 @@ void LoadIC::GenerateNormal(MacroAssembler* masm) {
|
|
|
| // Dictionary load failed, go slow (but don't miss).
|
| __ bind(&slow);
|
| - GenerateSlow(masm);
|
| + GenerateRuntimeGetProperty(masm);
|
| }
|
|
|
|
|
| @@ -323,16 +318,13 @@ void LoadIC::GenerateMiss(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| -void LoadIC::GenerateSlow(MacroAssembler* masm) {
|
| +void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) {
|
| // The return address is in ra.
|
|
|
| __ mov(LoadIC_TempRegister(), LoadDescriptor::ReceiverRegister());
|
| __ Push(LoadIC_TempRegister(), LoadDescriptor::NameRegister());
|
|
|
| - ExternalReference ref =
|
| - ExternalReference(IC_Utility(kLoadIC_Slow), masm->isolate());
|
| - int arg_count = 2;
|
| - __ TailCallExternalReference(ref, arg_count, 1);
|
| + __ TailCallRuntime(Runtime::kGetProperty, 2, 1);
|
| }
|
|
|
|
|
| @@ -355,20 +347,16 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| -void KeyedLoadIC::GenerateSlow(MacroAssembler* masm) {
|
| +void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) {
|
| // The return address is in ra.
|
|
|
| __ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister());
|
|
|
| - ExternalReference ref =
|
| - ExternalReference(IC_Utility(kKeyedLoadIC_Slow), masm->isolate());
|
| - int arg_count = 2;
|
| - __ TailCallExternalReference(ref, arg_count, 1);
|
| + __ TailCallRuntime(Runtime::kKeyedGetProperty, 2, 1);
|
| }
|
|
|
|
|
| -void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm,
|
| - LanguageMode language_mode) {
|
| +void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| // The return address is in ra.
|
| Label slow, check_name, index_smi, index_name, property_array_property;
|
| Label probe_dictionary, check_number_dictionary;
|
| @@ -392,8 +380,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm,
|
| // Check the receiver's map to see if it has fast elements.
|
| __ CheckFastElements(a0, a3, &check_number_dictionary);
|
|
|
| - GenerateFastArrayLoad(masm, receiver, key, a0, a3, a4, v0, &slow,
|
| - language_mode);
|
| + GenerateFastArrayLoad(masm, receiver, key, a0, a3, a4, v0, &slow);
|
| __ IncrementCounter(isolate->counters()->keyed_load_generic_smi(), 1, a4, a3);
|
| __ Ret();
|
|
|
| @@ -414,7 +401,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm,
|
| __ bind(&slow);
|
| __ IncrementCounter(isolate->counters()->keyed_load_generic_slow(), 1, a4,
|
| a3);
|
| - GenerateSlow(masm);
|
| + GenerateRuntimeGetProperty(masm);
|
|
|
| __ bind(&check_name);
|
| GenerateKeyNameCheck(masm, key, a0, a3, &index_name, &slow);
|
|
|