Index: src/x64/lithium-codegen-x64.cc |
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc |
index 1af400138692a7a37c5b37a9b951f7d17756ae49..775a948be2298ff618a2c9c2073b2c6c99014f1a 100644 |
--- a/src/x64/lithium-codegen-x64.cc |
+++ b/src/x64/lithium-codegen-x64.cc |
@@ -2886,7 +2886,8 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr); |
} |
ContextualMode mode = instr->for_typeof() ? NOT_CONTEXTUAL : CONTEXTUAL; |
- Handle<Code> ic = CodeFactory::LoadICInOptimizedCode(isolate(), mode).code(); |
+ Handle<Code> ic = |
+ CodeFactory::LoadICInOptimizedCode(isolate(), mode, false).code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -3029,8 +3030,9 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) { |
if (FLAG_vector_ics) { |
EmitVectorLoadICRegisters<LLoadNamedGeneric>(instr); |
} |
- Handle<Code> ic = |
- CodeFactory::LoadICInOptimizedCode(isolate(), NOT_CONTEXTUAL).code(); |
+ bool emit_megamorphic = instr->hydrogen()->emit_megamorphic(); |
+ Handle<Code> ic = CodeFactory::LoadICInOptimizedCode( |
+ isolate(), NOT_CONTEXTUAL, emit_megamorphic).code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -4270,7 +4272,9 @@ void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) { |
DCHECK(ToRegister(instr->value()).is(StoreDescriptor::ValueRegister())); |
__ Move(StoreDescriptor::NameRegister(), instr->hydrogen()->name()); |
- Handle<Code> ic = StoreIC::initialize_stub(isolate(), instr->language_mode()); |
+ bool emit_megamorphic = instr->hydrogen()->emit_megamorphic(); |
+ Handle<Code> ic = StoreIC::initialize_stub(isolate(), instr->language_mode(), |
+ emit_megamorphic); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |