Index: src/ic/arm64/ic-arm64.cc |
diff --git a/src/ic/arm64/ic-arm64.cc b/src/ic/arm64/ic-arm64.cc |
index 61821551a130775909c4cc4434c72a02b85aa719..726a68e45f4ab4f085e2abb3e6d8dfb210b7f107 100644 |
--- a/src/ic/arm64/ic-arm64.cc |
+++ b/src/ic/arm64/ic-arm64.cc |
@@ -164,8 +164,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) { |
DCHECK(!AreAliased(receiver, key, elements, scratch1, scratch2)); |
Label check_prototypes, check_next_prototype; |
@@ -203,13 +202,8 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver, |
__ 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); |
- } |
+ __ LoadRoot(result, Heap::kUndefinedValueRootIndex); |
+ __ B(&done); |
__ Bind(&in_bounds); |
// Fast case: Do the load. |
@@ -260,8 +254,7 @@ static void GenerateKeyNameCheck(MacroAssembler* masm, Register key, |
// Fall through if the key is a unique name. |
} |
- |
-void LoadIC::GenerateNormal(MacroAssembler* masm, LanguageMode language_mode) { |
+void LoadIC::GenerateNormal(MacroAssembler* masm) { |
Register dictionary = x0; |
DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister())); |
DCHECK(!dictionary.is(LoadDescriptor::NameRegister())); |
@@ -275,7 +268,7 @@ void LoadIC::GenerateNormal(MacroAssembler* masm, LanguageMode language_mode) { |
// Dictionary load failed, go slow (but don't miss). |
__ Bind(&slow); |
- GenerateRuntimeGetProperty(masm, language_mode); |
+ GenerateRuntimeGetProperty(masm); |
} |
@@ -296,15 +289,12 @@ void LoadIC::GenerateMiss(MacroAssembler* masm) { |
__ TailCallRuntime(Runtime::kLoadIC_Miss); |
} |
- |
-void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm, |
- LanguageMode language_mode) { |
+void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
// The return address is in lr. |
__ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister()); |
// Do tail-call to runtime routine. |
- __ TailCallRuntime(is_strong(language_mode) ? Runtime::kGetPropertyStrong |
- : Runtime::kGetProperty); |
+ __ TailCallRuntime(Runtime::kGetProperty); |
} |
@@ -325,24 +315,19 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm) { |
__ TailCallRuntime(Runtime::kKeyedLoadIC_Miss); |
} |
- |
-void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm, |
- LanguageMode language_mode) { |
+void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
// The return address is in lr. |
__ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister()); |
// Do tail-call to runtime routine. |
- __ TailCallRuntime(is_strong(language_mode) ? Runtime::kKeyedGetPropertyStrong |
- : Runtime::kKeyedGetProperty); |
+ __ TailCallRuntime(Runtime::kKeyedGetProperty); |
} |
- |
static void GenerateKeyedLoadWithSmiKey(MacroAssembler* masm, Register key, |
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)); |
@@ -358,7 +343,7 @@ static void GenerateKeyedLoadWithSmiKey(MacroAssembler* masm, Register key, |
__ CheckFastElements(scratch1, scratch2, &check_number_dictionary); |
GenerateFastArrayLoad(masm, receiver, key, scratch3, scratch2, scratch1, |
- result, slow, language_mode); |
+ result, slow); |
__ IncrementCounter(isolate->counters()->ic_keyed_load_generic_smi(), 1, |
scratch1, scratch2); |
__ Ret(); |
@@ -429,9 +414,7 @@ static void GenerateKeyedLoadWithNameKey(MacroAssembler* masm, Register key, |
__ Ret(); |
} |
- |
-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; |
@@ -444,14 +427,13 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
__ 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()->ic_keyed_load_generic_slow(), |
1, x4, x3); |
- GenerateRuntimeGetProperty(masm, language_mode); |
+ GenerateRuntimeGetProperty(masm); |
__ Bind(&check_name); |
GenerateKeyNameCheck(masm, key, x0, x3, &index_name, &slow); |