Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index 0779f8b9d270aa8555531184509b92e2e3a23669..cf5863dc6760e0c4fb58a4e3581740eda486f3ce 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -2248,7 +2248,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ ldr(load_name, MemOperand(sp, 2 * kPointerSize)); |
__ mov(LoadDescriptor::SlotRegister(), |
Operand(SmiFromSlot(expr->KeyedLoadFeedbackSlot()))); |
- Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code(); |
+ Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate(), SLOPPY).code(); |
CallIC(ic, TypeFeedbackId::None()); |
__ mov(r1, r0); |
__ str(r1, MemOperand(sp, 2 * kPointerSize)); |
@@ -2429,7 +2429,7 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) { |
__ mov(LoadDescriptor::NameRegister(), Operand(key->value())); |
__ mov(LoadDescriptor::SlotRegister(), |
Operand(SmiFromSlot(prop->PropertyFeedbackSlot()))); |
- CallLoadIC(NOT_CONTEXTUAL); |
+ CallLoadIC(NOT_CONTEXTUAL, language_mode()); |
} |
@@ -2441,13 +2441,14 @@ void FullCodeGenerator::EmitNamedSuperPropertyLoad(Property* prop) { |
DCHECK(prop->IsSuperAccess()); |
__ Push(key->value()); |
- __ CallRuntime(Runtime::kLoadFromSuper, 3); |
+ __ Push(Smi::FromInt(language_mode())); |
+ __ CallRuntime(Runtime::kLoadFromSuper, 4); |
} |
void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) { |
SetSourcePosition(prop->position()); |
- Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code(); |
+ Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate(), language_mode()).code(); |
__ mov(LoadDescriptor::SlotRegister(), |
Operand(SmiFromSlot(prop->PropertyFeedbackSlot()))); |
CallIC(ic); |
@@ -2456,9 +2457,10 @@ void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) { |
void FullCodeGenerator::EmitKeyedSuperPropertyLoad(Property* prop) { |
// Stack: receiver, home_object, key. |
+ __ Push(Smi::FromInt(language_mode())); |
SetSourcePosition(prop->position()); |
- __ CallRuntime(Runtime::kLoadKeyedFromSuper, 3); |
+ __ CallRuntime(Runtime::kLoadKeyedFromSuper, 4); |
} |
@@ -2997,6 +2999,7 @@ void FullCodeGenerator::EmitSuperCallWithLoadIC(Call* expr) { |
__ ldr(scratch, MemOperand(sp, kPointerSize * 2)); |
__ Push(scratch); |
__ Push(key->value()); |
+ __ Push(Smi::FromInt(language_mode())); |
// Stack here: |
// - home_object |
@@ -3004,7 +3007,8 @@ void FullCodeGenerator::EmitSuperCallWithLoadIC(Call* expr) { |
// - this (receiver) <-- LoadFromSuper will pop here and below. |
// - home_object |
// - key |
- __ CallRuntime(Runtime::kLoadFromSuper, 3); |
+ // - language_mode |
+ __ CallRuntime(Runtime::kLoadFromSuper, 4); |
// Replace home_object with target function. |
__ str(r0, MemOperand(sp, kPointerSize)); |
@@ -3057,6 +3061,7 @@ void FullCodeGenerator::EmitKeyedSuperCallWithLoadIC(Call* expr) { |
__ ldr(scratch, MemOperand(sp, kPointerSize * 2)); |
__ Push(scratch); |
VisitForStackValue(prop->key()); |
+ __ Push(Smi::FromInt(language_mode())); |
// Stack here: |
// - home_object |
@@ -3064,7 +3069,8 @@ void FullCodeGenerator::EmitKeyedSuperCallWithLoadIC(Call* expr) { |
// - this (receiver) <-- LoadKeyedFromSuper will pop here and below. |
// - home_object |
// - key |
- __ CallRuntime(Runtime::kLoadKeyedFromSuper, 3); |
+ // - language_mode |
+ __ CallRuntime(Runtime::kLoadKeyedFromSuper, 4); |
// Replace home_object with target function. |
__ str(r0, MemOperand(sp, kPointerSize)); |