Index: src/crankshaft/ppc/lithium-codegen-ppc.cc |
diff --git a/src/crankshaft/ppc/lithium-codegen-ppc.cc b/src/crankshaft/ppc/lithium-codegen-ppc.cc |
index 31d9ebe4fdb63d5498602571239604ec110281a3..37a121c1dad201508bac8ce89ece5e3a83d7a568 100644 |
--- a/src/crankshaft/ppc/lithium-codegen-ppc.cc |
+++ b/src/crankshaft/ppc/lithium-codegen-ppc.cc |
@@ -2699,8 +2699,7 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
__ mov(LoadDescriptor::NameRegister(), Operand(instr->name())); |
EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr); |
Handle<Code> ic = CodeFactory::LoadICInOptimizedCode( |
- isolate(), instr->typeof_mode(), PREMONOMORPHIC) |
- .code(); |
+ isolate(), instr->typeof_mode()).code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -2815,10 +2814,8 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) { |
// Name is always in r5. |
__ mov(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); |
} |
@@ -3176,14 +3173,9 @@ void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(cp)); |
DCHECK(ToRegister(instr->object()).is(LoadDescriptor::ReceiverRegister())); |
DCHECK(ToRegister(instr->key()).is(LoadDescriptor::NameRegister())); |
+ EmitVectorLoadICRegisters<LLoadKeyedGeneric>(instr); |
- if (instr->hydrogen()->HasVectorAndSlot()) { |
- 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); |
} |
@@ -4097,14 +4089,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); |
__ mov(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); |
} |
@@ -4359,13 +4349,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); |
} |