Index: src/crankshaft/mips/lithium-codegen-mips.cc |
diff --git a/src/crankshaft/mips/lithium-codegen-mips.cc b/src/crankshaft/mips/lithium-codegen-mips.cc |
index bdc5c64fcf934367321e6c2620b682929e593dab..490ed7a0ac58ced7fb6f95fd9f4deabd7a73236b 100644 |
--- a/src/crankshaft/mips/lithium-codegen-mips.cc |
+++ b/src/crankshaft/mips/lithium-codegen-mips.cc |
@@ -2521,9 +2521,9 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
__ li(LoadDescriptor::NameRegister(), Operand(instr->name())); |
EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr); |
- Handle<Code> ic = CodeFactory::LoadICInOptimizedCode( |
- isolate(), instr->typeof_mode(), PREMONOMORPHIC) |
- .code(); |
+ Handle<Code> ic = |
+ CodeFactory::LoadICInOptimizedCode(isolate(), instr->typeof_mode()) |
+ .code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -2622,10 +2622,8 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) { |
// Name is always in a2. |
__ li(LoadDescriptor::NameRegister(), Operand(instr->name())); |
EmitVectorLoadICRegisters<LLoadNamedGeneric>(instr); |
- Handle<Code> ic = CodeFactory::LoadICInOptimizedCode( |
- isolate(), NOT_INSIDE_TYPEOF, |
- instr->hydrogen()->initialization_state()) |
- .code(); |
+ Handle<Code> ic = |
+ CodeFactory::LoadICInOptimizedCode(isolate(), NOT_INSIDE_TYPEOF).code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -2930,13 +2928,9 @@ void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) { |
DCHECK(ToRegister(instr->object()).is(LoadDescriptor::ReceiverRegister())); |
DCHECK(ToRegister(instr->key()).is(LoadDescriptor::NameRegister())); |
- if (instr->hydrogen()->HasVectorAndSlot()) { |
- EmitVectorLoadICRegisters<LLoadKeyedGeneric>(instr); |
- } |
+ EmitVectorLoadICRegisters<LLoadKeyedGeneric>(instr); |
- Handle<Code> ic = CodeFactory::KeyedLoadICInOptimizedCode( |
- isolate(), instr->hydrogen()->initialization_state()) |
- .code(); |
+ Handle<Code> ic = CodeFactory::KeyedLoadICInOptimizedCode(isolate()).code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -3809,14 +3803,12 @@ void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) { |
DCHECK(ToRegister(instr->object()).is(StoreDescriptor::ReceiverRegister())); |
DCHECK(ToRegister(instr->value()).is(StoreDescriptor::ValueRegister())); |
- if (instr->hydrogen()->HasVectorAndSlot()) { |
- EmitVectorStoreICRegisters<LStoreNamedGeneric>(instr); |
- } |
+ EmitVectorStoreICRegisters<LStoreNamedGeneric>(instr); |
__ li(StoreDescriptor::NameRegister(), Operand(instr->name())); |
- Handle<Code> ic = CodeFactory::StoreICInOptimizedCode( |
- isolate(), instr->language_mode(), |
- instr->hydrogen()->initialization_state()).code(); |
+ Handle<Code> ic = |
+ CodeFactory::StoreICInOptimizedCode(isolate(), instr->language_mode()) |
+ .code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -4037,13 +4029,11 @@ void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) { |
DCHECK(ToRegister(instr->key()).is(StoreDescriptor::NameRegister())); |
DCHECK(ToRegister(instr->value()).is(StoreDescriptor::ValueRegister())); |
- if (instr->hydrogen()->HasVectorAndSlot()) { |
- EmitVectorStoreICRegisters<LStoreKeyedGeneric>(instr); |
- } |
+ EmitVectorStoreICRegisters<LStoreKeyedGeneric>(instr); |
Handle<Code> ic = CodeFactory::KeyedStoreICInOptimizedCode( |
- isolate(), instr->language_mode(), |
- instr->hydrogen()->initialization_state()).code(); |
+ isolate(), instr->language_mode()) |
+ .code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |