Index: src/ic/x87/ic-x87.cc |
diff --git a/src/ic/x87/ic-x87.cc b/src/ic/x87/ic-x87.cc |
index 3b15c7e6ae5eb03f9dba61b9d55013cb5f463c2b..5bbd9c58145f74fb2dafdc346b9caff9a0d86a77 100644 |
--- a/src/ic/x87/ic-x87.cc |
+++ b/src/ic/x87/ic-x87.cc |
@@ -167,7 +167,7 @@ static void GenerateKeyedLoadReceiverCheck(MacroAssembler* masm, |
static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver, |
Register key, Register scratch, |
Register scratch2, Register result, |
- Label* slow, LanguageMode language_mode) { |
+ Label* slow) { |
// Register use: |
// receiver - holds the receiver and is unchanged. |
// key - holds the key and is unchanged (must be a smi). |
@@ -211,13 +211,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 { |
- __ mov(result, masm->isolate()->factory()->undefined_value()); |
- __ jmp(&done); |
- } |
+ __ mov(result, masm->isolate()->factory()->undefined_value()); |
+ __ jmp(&done); |
__ bind(&in_bounds); |
// Fast case: Do the load. |
@@ -262,9 +257,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; |
@@ -286,8 +279,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
// Check the receiver's map to see if it has fast elements. |
__ CheckFastElements(eax, &check_number_dictionary); |
- GenerateFastArrayLoad(masm, receiver, key, eax, ebx, eax, &slow, |
- language_mode); |
+ GenerateFastArrayLoad(masm, receiver, key, eax, ebx, eax, &slow); |
Isolate* isolate = masm->isolate(); |
Counters* counters = isolate->counters(); |
__ IncrementCounter(counters->ic_keyed_load_generic_smi(), 1); |
@@ -319,7 +311,7 @@ void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm, |
__ bind(&slow); |
// Slow case: jump to runtime. |
__ IncrementCounter(counters->ic_keyed_load_generic_slow(), 1); |
- GenerateRuntimeGetProperty(masm, language_mode); |
+ GenerateRuntimeGetProperty(masm); |
__ bind(&check_name); |
GenerateKeyNameCheck(masm, key, eax, ebx, &index_name, &slow); |
@@ -628,8 +620,7 @@ void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm, |
GenerateMiss(masm); |
} |
- |
-void LoadIC::GenerateNormal(MacroAssembler* masm, LanguageMode language_mode) { |
+void LoadIC::GenerateNormal(MacroAssembler* masm) { |
Register dictionary = eax; |
DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister())); |
DCHECK(!dictionary.is(LoadDescriptor::NameRegister())); |
@@ -644,7 +635,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); |
} |
@@ -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) { |
// Return address is on the stack. |
Register receiver = LoadDescriptor::ReceiverRegister(); |
Register name = LoadDescriptor::NameRegister(); |
@@ -689,8 +678,7 @@ void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm, |
__ push(ebx); |
// Do tail-call to runtime routine. |
- __ TailCallRuntime(is_strong(language_mode) ? Runtime::kGetPropertyStrong |
- : Runtime::kGetProperty); |
+ __ TailCallRuntime(Runtime::kGetProperty); |
} |
@@ -704,9 +692,7 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm) { |
__ TailCallRuntime(Runtime::kKeyedLoadIC_Miss); |
} |
- |
-void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm, |
- LanguageMode language_mode) { |
+void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
// Return address is on the stack. |
Register receiver = LoadDescriptor::ReceiverRegister(); |
Register name = LoadDescriptor::NameRegister(); |
@@ -718,8 +704,7 @@ void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm, |
__ push(ebx); |
// Do tail-call to runtime routine. |
- __ TailCallRuntime(is_strong(language_mode) ? Runtime::kKeyedGetPropertyStrong |
- : Runtime::kKeyedGetProperty); |
+ __ TailCallRuntime(Runtime::kKeyedGetProperty); |
} |