| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 6cf98f8422c3cc9fd9ac4fcbeb9178ea936fdefc..c1e698189124508c2e18d8234806fbb0b87692b3 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -3038,7 +3038,7 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) {
|
| __ mov(LoadDescriptor::NameRegister(), Operand(instr->name()));
|
| EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr);
|
| ContextualMode mode = instr->for_typeof() ? NOT_CONTEXTUAL : CONTEXTUAL;
|
| - Handle<Code> ic = CodeFactory::LoadICInOptimizedCode(isolate(), mode,
|
| + Handle<Code> ic = CodeFactory::LoadICInOptimizedCode(isolate(), mode, SLOPPY,
|
| PREMONOMORPHIC).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
| @@ -3134,9 +3134,10 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) {
|
| // Name is always in r2.
|
| __ mov(LoadDescriptor::NameRegister(), Operand(instr->name()));
|
| EmitVectorLoadICRegisters<LLoadNamedGeneric>(instr);
|
| - Handle<Code> ic = CodeFactory::LoadICInOptimizedCode(
|
| - isolate(), NOT_CONTEXTUAL,
|
| - instr->hydrogen()->initialization_state()).code();
|
| + Handle<Code> ic =
|
| + CodeFactory::LoadICInOptimizedCode(
|
| + isolate(), NOT_CONTEXTUAL, instr->hydrogen()->language_mode(),
|
| + instr->hydrogen()->initialization_state()).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr, NEVER_INLINE_TARGET_ADDRESS);
|
| }
|
|
|
| @@ -3443,9 +3444,9 @@ void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) {
|
| EmitVectorLoadICRegisters<LLoadKeyedGeneric>(instr);
|
| }
|
|
|
| - Handle<Code> ic =
|
| - CodeFactory::KeyedLoadICInOptimizedCode(
|
| - isolate(), instr->hydrogen()->initialization_state()).code();
|
| + Handle<Code> ic = CodeFactory::KeyedLoadICInOptimizedCode(
|
| + isolate(), instr->hydrogen()->language_mode(),
|
| + instr->hydrogen()->initialization_state()).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr, NEVER_INLINE_TARGET_ADDRESS);
|
| }
|
|
|
|
|