Index: src/ic/x64/ic-x64.cc |
diff --git a/src/ic/x64/ic-x64.cc b/src/ic/x64/ic-x64.cc |
index f3535ddfc1f1b7d968e2a61621d80793f1666db9..247116d7fea28614d8229a7cbbbd7c6446b8848e 100644 |
--- a/src/ic/x64/ic-x64.cc |
+++ b/src/ic/x64/ic-x64.cc |
@@ -167,7 +167,7 @@ static void GenerateKeyedLoadReceiverCheck(MacroAssembler* masm, |
static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver, |
Register key, Register elements, |
Register scratch, Register result, |
- Label* slow, LanguageMode language_mode) { |
+ Label* slow) { |
// Register use: |
// |
// receiver - holds the receiver on entry. |
@@ -222,13 +222,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. |
@@ -274,9 +269,7 @@ static void GenerateKeyNameCheck(MacroAssembler* masm, Register key, |
__ bind(&unique); |
} |
- |
-void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
- LanguageMode language_mode) { |
+void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) { |
// The return address is on the stack. |
Label slow, check_name, index_smi, index_name, property_array_property; |
Label probe_dictionary, check_number_dictionary; |
@@ -298,8 +291,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
// Check the receiver's map to see if it has fast elements. |
__ CheckFastElements(rax, &check_number_dictionary); |
- GenerateFastArrayLoad(masm, receiver, key, rax, rbx, rax, &slow, |
- language_mode); |
+ GenerateFastArrayLoad(masm, receiver, key, rax, rbx, rax, &slow); |
Counters* counters = masm->isolate()->counters(); |
__ IncrementCounter(counters->ic_keyed_load_generic_smi(), 1); |
__ ret(0); |
@@ -320,7 +312,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
__ bind(&slow); |
// Slow case: Jump to runtime. |
__ IncrementCounter(counters->ic_keyed_load_generic_slow(), 1); |
- KeyedLoadIC::GenerateRuntimeGetProperty(masm, language_mode); |
+ KeyedLoadIC::GenerateRuntimeGetProperty(masm); |
__ bind(&check_name); |
GenerateKeyNameCheck(masm, key, rax, rbx, &index_name, &slow); |
@@ -626,8 +618,7 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm, |
GenerateMiss(masm); |
} |
- |
-void LoadIC::GenerateNormal(MacroAssembler* masm, LanguageMode language_mode) { |
+void LoadIC::GenerateNormal(MacroAssembler* masm) { |
Register dictionary = rax; |
DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister())); |
DCHECK(!dictionary.is(LoadDescriptor::NameRegister())); |
@@ -642,7 +633,7 @@ void LoadIC::GenerateNormal(MacroAssembler* masm, LanguageMode language_mode) { |
// Dictionary load failed, go slow (but don't miss). |
__ bind(&slow); |
- LoadIC::GenerateRuntimeGetProperty(masm, language_mode); |
+ LoadIC::GenerateRuntimeGetProperty(masm); |
} |
@@ -675,9 +666,7 @@ 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 on the stack. |
Register receiver = LoadDescriptor::ReceiverRegister(); |
Register name = LoadDescriptor::NameRegister(); |
@@ -690,8 +679,7 @@ void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm, |
__ PushReturnAddressFrom(rbx); |
// Do tail-call to runtime routine. |
- __ TailCallRuntime(is_strong(language_mode) ? Runtime::kGetPropertyStrong |
- : Runtime::kGetProperty); |
+ __ TailCallRuntime(Runtime::kGetProperty); |
} |
@@ -706,9 +694,7 @@ 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 on the stack. |
Register receiver = LoadDescriptor::ReceiverRegister(); |
Register name = LoadDescriptor::NameRegister(); |
@@ -721,8 +707,7 @@ void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm, |
__ PushReturnAddressFrom(rbx); |
// Do tail-call to runtime routine. |
- __ TailCallRuntime(is_strong(language_mode) ? Runtime::kKeyedGetPropertyStrong |
- : Runtime::kKeyedGetProperty); |
+ __ TailCallRuntime(Runtime::kKeyedGetProperty); |
} |