Index: src/ic/mips64/ic-mips64.cc |
diff --git a/src/ic/mips64/ic-mips64.cc b/src/ic/mips64/ic-mips64.cc |
index b0cabbbe74b89eef7c284a6489e40589803157ab..f46c9dcb26b9783adb66444cc29f70ea3e470368 100644 |
--- a/src/ic/mips64/ic-mips64.cc |
+++ b/src/ic/mips64/ic-mips64.cc |
@@ -158,8 +158,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. |
@@ -215,12 +214,8 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver, |
__ Branch(&check_next_prototype); |
__ bind(&absent); |
- if (is_strong(language_mode)) { |
- __ Branch(slow); |
- } else { |
- __ LoadRoot(result, Heap::kUndefinedValueRootIndex); |
- __ Branch(&done); |
- } |
+ __ LoadRoot(result, Heap::kUndefinedValueRootIndex); |
+ __ Branch(&done); |
__ bind(&in_bounds); |
// Fast case: Do the load. |
@@ -269,8 +264,7 @@ static void GenerateKeyNameCheck(MacroAssembler* masm, Register key, |
__ bind(&unique); |
} |
- |
-void LoadIC::GenerateNormal(MacroAssembler* masm, LanguageMode language_mode) { |
+void LoadIC::GenerateNormal(MacroAssembler* masm) { |
Register dictionary = a0; |
DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister())); |
DCHECK(!dictionary.is(LoadDescriptor::NameRegister())); |
@@ -284,7 +278,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); |
} |
@@ -316,17 +310,14 @@ 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 ra. |
__ mov(LoadIC_TempRegister(), LoadDescriptor::ReceiverRegister()); |
__ Push(LoadIC_TempRegister(), LoadDescriptor::NameRegister()); |
// Do tail-call to runtime routine. |
- __ TailCallRuntime(is_strong(language_mode) ? Runtime::kGetPropertyStrong |
- : Runtime::kGetProperty); |
+ __ TailCallRuntime(Runtime::kGetProperty); |
} |
@@ -344,21 +335,16 @@ 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 ra. |
__ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister()); |
// Do tail-call to runtime routine. |
- __ TailCallRuntime(is_strong(language_mode) ? Runtime::kKeyedGetPropertyStrong |
- : Runtime::kKeyedGetProperty); |
+ __ TailCallRuntime(Runtime::kKeyedGetProperty); |
} |
- |
-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; |
@@ -382,8 +368,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()->ic_keyed_load_generic_smi(), 1, a4, |
a3); |
__ Ret(); |
@@ -405,7 +390,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
__ bind(&slow); |
__ IncrementCounter(isolate->counters()->ic_keyed_load_generic_slow(), 1, a4, |
a3); |
- GenerateRuntimeGetProperty(masm, language_mode); |
+ GenerateRuntimeGetProperty(masm); |
__ bind(&check_name); |
GenerateKeyNameCheck(masm, key, a0, a3, &index_name, &slow); |