| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index b64d9930ba4d219001d7be72cbbd8169fa1c0255..998119619c4c9ce2ca543daeb9586b2e40d32ea9 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -779,9 +779,9 @@ void FullCodeGenerator::EmitDeclaration(Variable* variable,
|
| prop->key()->AsLiteral()->handle()->IsSmi());
|
| __ mov(r1, Operand(prop->key()->AsLiteral()->handle()));
|
|
|
| - Handle<Code> ic(Builtins::builtin(is_strict()
|
| - ? Builtins::KeyedStoreIC_Initialize_Strict
|
| - : Builtins::KeyedStoreIC_Initialize));
|
| + Handle<Code> ic(Builtins::builtin(
|
| + is_strict_mode() ? Builtins::KeyedStoreIC_Initialize_Strict
|
| + : Builtins::KeyedStoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
| // Value in r0 is ignored (declarations are statements).
|
| }
|
| @@ -1831,8 +1831,8 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, int bailout_ast_id) {
|
| __ pop(r0); // Restore value.
|
| __ mov(r2, Operand(prop->key()->AsLiteral()->handle()));
|
| Handle<Code> ic(Builtins::builtin(
|
| - is_strict() ? Builtins::StoreIC_Initialize_Strict
|
| - : Builtins::StoreIC_Initialize));
|
| + is_strict_mode() ? Builtins::StoreIC_Initialize_Strict
|
| + : Builtins::StoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
| break;
|
| }
|
| @@ -1854,8 +1854,8 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, int bailout_ast_id) {
|
| }
|
| __ pop(r0); // Restore value.
|
| Handle<Code> ic(Builtins::builtin(
|
| - is_strict() ? Builtins::KeyedStoreIC_Initialize_Strict
|
| - : Builtins::KeyedStoreIC_Initialize));
|
| + is_strict_mode() ? Builtins::KeyedStoreIC_Initialize_Strict
|
| + : Builtins::KeyedStoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
| break;
|
| }
|
| @@ -1880,8 +1880,8 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var,
|
| __ mov(r2, Operand(var->name()));
|
| __ ldr(r1, GlobalObjectOperand());
|
| Handle<Code> ic(Builtins::builtin(
|
| - is_strict() ? Builtins::StoreIC_Initialize_Strict
|
| - : Builtins::StoreIC_Initialize));
|
| + is_strict_mode() ? Builtins::StoreIC_Initialize_Strict
|
| + : Builtins::StoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET_CONTEXT);
|
|
|
| } else if (op == Token::INIT_CONST) {
|
| @@ -1989,8 +1989,8 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) {
|
| }
|
|
|
| Handle<Code> ic(Builtins::builtin(
|
| - is_strict() ? Builtins::StoreIC_Initialize_Strict
|
| - : Builtins::StoreIC_Initialize));
|
| + is_strict_mode() ? Builtins::StoreIC_Initialize_Strict
|
| + : Builtins::StoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
|
|
| // If the assignment ends an initialization block, revert to fast case.
|
| @@ -2035,8 +2035,8 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) {
|
| }
|
|
|
| Handle<Code> ic(Builtins::builtin(
|
| - is_strict() ? Builtins::KeyedStoreIC_Initialize_Strict
|
| - : Builtins::KeyedStoreIC_Initialize));
|
| + is_strict_mode() ? Builtins::KeyedStoreIC_Initialize_Strict
|
| + : Builtins::KeyedStoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
|
|
| // If the assignment ends an initialization block, revert to fast case.
|
| @@ -3887,8 +3887,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| __ mov(r2, Operand(prop->key()->AsLiteral()->handle()));
|
| __ pop(r1);
|
| Handle<Code> ic(Builtins::builtin(
|
| - is_strict() ? Builtins::StoreIC_Initialize_Strict
|
| - : Builtins::StoreIC_Initialize));
|
| + is_strict_mode() ? Builtins::StoreIC_Initialize_Strict
|
| + : Builtins::StoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
| PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| if (expr->is_postfix()) {
|
| @@ -3904,8 +3904,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| __ pop(r1); // Key.
|
| __ pop(r2); // Receiver.
|
| Handle<Code> ic(Builtins::builtin(
|
| - is_strict() ? Builtins::KeyedStoreIC_Initialize_Strict
|
| - : Builtins::KeyedStoreIC_Initialize));
|
| + is_strict_mode() ? Builtins::KeyedStoreIC_Initialize_Strict
|
| + : Builtins::KeyedStoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
| PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| if (expr->is_postfix()) {
|
|
|