Index: src/ic/arm/ic-arm.cc |
diff --git a/src/ic/arm/ic-arm.cc b/src/ic/arm/ic-arm.cc |
index a0281abc90e701740713353e89f72ac14d9688a6..14ed8b41a56bb4b86c3b30077c9eebce2347939a 100644 |
--- a/src/ic/arm/ic-arm.cc |
+++ b/src/ic/arm/ic-arm.cc |
@@ -157,8 +157,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,13 +214,8 @@ static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver, |
__ jmp(&check_next_prototype); |
__ bind(&absent); |
- if (is_strong(language_mode)) { |
- // Strong mode accesses must throw in this case, so call the runtime. |
- __ jmp(slow); |
- } else { |
- __ LoadRoot(result, Heap::kUndefinedValueRootIndex); |
- __ jmp(&done); |
- } |
+ __ LoadRoot(result, Heap::kUndefinedValueRootIndex); |
+ __ jmp(&done); |
__ bind(&in_bounds); |
// Fast case: Do the load. |
@@ -264,8 +258,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 = r0; |
DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister())); |
DCHECK(!dictionary.is(LoadDescriptor::NameRegister())); |
@@ -280,7 +273,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); |
} |
@@ -312,17 +305,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 lr. |
__ 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); |
} |
@@ -340,22 +330,17 @@ 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()); |
// Perform tail call to the entry. |
// 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 lr. |
Label slow, check_name, index_smi, index_name, property_array_property; |
Label probe_dictionary, check_number_dictionary; |
@@ -379,8 +364,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
// Check the receiver's map to see if it has fast elements. |
__ CheckFastElements(r0, r3, &check_number_dictionary); |
- GenerateFastArrayLoad(masm, receiver, key, r0, r3, r4, r0, &slow, |
- language_mode); |
+ GenerateFastArrayLoad(masm, receiver, key, r0, r3, r4, r0, &slow); |
__ IncrementCounter(isolate->counters()->ic_keyed_load_generic_smi(), 1, r4, |
r3); |
__ Ret(); |
@@ -403,7 +387,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
__ bind(&slow); |
__ IncrementCounter(isolate->counters()->ic_keyed_load_generic_slow(), 1, r4, |
r3); |
- GenerateRuntimeGetProperty(masm, language_mode); |
+ GenerateRuntimeGetProperty(masm); |
__ bind(&check_name); |
GenerateKeyNameCheck(masm, key, r0, r3, &index_name, &slow); |