| Index: src/ic/arm64/ic-arm64.cc
|
| diff --git a/src/ic/arm64/ic-arm64.cc b/src/ic/arm64/ic-arm64.cc
|
| index e513845a311c2317937ee7dd275de08d82e888d7..e0bf48b26008f3d3a44faa56ba65f7e35be9318d 100644
|
| --- a/src/ic/arm64/ic-arm64.cc
|
| +++ b/src/ic/arm64/ic-arm64.cc
|
| @@ -167,12 +167,11 @@
|
| 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) {
|
| DCHECK(!AreAliased(receiver, key, elements, scratch1, scratch2));
|
|
|
| Label check_prototypes, check_next_prototype;
|
| - Label done, in_bounds, absent;
|
| + Label done, in_bounds, return_undefined;
|
|
|
| // Check for fast array.
|
| __ Ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| @@ -192,7 +191,7 @@
|
| __ Bind(&check_next_prototype);
|
| __ Ldr(scratch2, FieldMemOperand(scratch2, Map::kPrototypeOffset));
|
| // scratch2: current prototype
|
| - __ JumpIfRoot(scratch2, Heap::kNullValueRootIndex, &absent);
|
| + __ JumpIfRoot(scratch2, Heap::kNullValueRootIndex, &return_undefined);
|
| __ Ldr(elements, FieldMemOperand(scratch2, JSObject::kElementsOffset));
|
| __ Ldr(scratch2, FieldMemOperand(scratch2, HeapObject::kMapOffset));
|
| // elements: elements of current prototype
|
| @@ -205,14 +204,9 @@
|
| __ JumpIfNotRoot(elements, Heap::kEmptyFixedArrayRootIndex, slow);
|
| __ B(&check_next_prototype);
|
|
|
| - __ Bind(&absent);
|
| - if (is_strong(language_mode)) {
|
| - // Strong mode accesses must throw in this case, so call the runtime.
|
| - __ B(slow);
|
| - } else {
|
| - __ LoadRoot(result, Heap::kUndefinedValueRootIndex);
|
| - __ B(&done);
|
| - }
|
| + __ Bind(&return_undefined);
|
| + __ LoadRoot(result, Heap::kUndefinedValueRootIndex);
|
| + __ B(&done);
|
|
|
| __ Bind(&in_bounds);
|
| // Fast case: Do the load.
|
| @@ -278,7 +272,7 @@
|
|
|
| // Dictionary load failed, go slow (but don't miss).
|
| __ Bind(&slow);
|
| - GenerateSlow(masm);
|
| + GenerateRuntimeGetProperty(masm);
|
| }
|
|
|
|
|
| @@ -302,15 +296,10 @@
|
| }
|
|
|
|
|
| -void LoadIC::GenerateSlow(MacroAssembler* masm) {
|
| +void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) {
|
| // The return address is in lr.
|
| __ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister());
|
| -
|
| - // Perform tail call to the entry.
|
| - ExternalReference ref =
|
| - ExternalReference(IC_Utility(kLoadIC_Slow), masm->isolate());
|
| - int arg_count = 2;
|
| - __ TailCallExternalReference(ref, arg_count, 1);
|
| + __ TailCallRuntime(Runtime::kGetProperty, 2, 1);
|
| }
|
|
|
|
|
| @@ -335,15 +324,10 @@
|
| }
|
|
|
|
|
| -void KeyedLoadIC::GenerateSlow(MacroAssembler* masm) {
|
| +void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) {
|
| // The return address is in lr.
|
| __ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister());
|
| -
|
| - // Perform tail call to the entry.
|
| - ExternalReference ref =
|
| - ExternalReference(IC_Utility(kKeyedLoadIC_Slow), masm->isolate());
|
| - int arg_count = 2;
|
| - __ TailCallExternalReference(ref, arg_count, 1);
|
| + __ TailCallRuntime(Runtime::kKeyedGetProperty, 2, 1);
|
| }
|
|
|
|
|
| @@ -351,8 +335,7 @@
|
| Register receiver, Register scratch1,
|
| Register scratch2, Register scratch3,
|
| Register scratch4, Register scratch5,
|
| - Label* slow,
|
| - LanguageMode language_mode) {
|
| + Label* slow) {
|
| DCHECK(!AreAliased(key, receiver, scratch1, scratch2, scratch3, scratch4,
|
| scratch5));
|
|
|
| @@ -368,7 +351,7 @@
|
| __ CheckFastElements(scratch1, scratch2, &check_number_dictionary);
|
|
|
| GenerateFastArrayLoad(masm, receiver, key, scratch3, scratch2, scratch1,
|
| - result, slow, language_mode);
|
| + result, slow);
|
| __ IncrementCounter(isolate->counters()->keyed_load_generic_smi(), 1,
|
| scratch1, scratch2);
|
| __ Ret();
|
| @@ -439,8 +422,7 @@
|
| }
|
|
|
|
|
| -void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm,
|
| - LanguageMode language_mode) {
|
| +void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| // The return address is in lr.
|
| Label slow, check_name, index_smi, index_name;
|
|
|
| @@ -453,14 +435,13 @@
|
| __ Bind(&index_smi);
|
| // Now the key is known to be a smi. This place is also jumped to from below
|
| // where a numeric string is converted to a smi.
|
| - GenerateKeyedLoadWithSmiKey(masm, key, receiver, x7, x3, x4, x5, x6, &slow,
|
| - language_mode);
|
| + GenerateKeyedLoadWithSmiKey(masm, key, receiver, x7, x3, x4, x5, x6, &slow);
|
|
|
| // Slow case.
|
| __ Bind(&slow);
|
| __ IncrementCounter(masm->isolate()->counters()->keyed_load_generic_slow(), 1,
|
| x4, x3);
|
| - GenerateSlow(masm);
|
| + GenerateRuntimeGetProperty(masm);
|
|
|
| __ Bind(&check_name);
|
| GenerateKeyNameCheck(masm, key, x0, x3, &index_name, &slow);
|
|
|