Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index 060d4ed57dc7597564b318895f6d7c15de3b6010..88484d4367e64fe828e933c039d3ce4617b823e3 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -727,9 +727,9 @@ void FullCodeGenerator::EmitDeclaration(Variable* variable, |
prop->key()->AsLiteral()->handle()->IsSmi()); |
__ Set(ecx, Immediate(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); |
} |
} |
@@ -1372,8 +1372,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
__ mov(ecx, Immediate(key->handle())); |
__ mov(edx, Operand(esp, 0)); |
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(key->id(), NO_REGISTERS); |
} else { |
@@ -1764,8 +1764,8 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, int bailout_ast_id) { |
__ pop(eax); // Restore value. |
__ mov(ecx, 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; |
} |
@@ -1787,8 +1787,8 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, int bailout_ast_id) { |
} |
__ pop(eax); // 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; |
} |
@@ -1813,8 +1813,8 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, |
__ mov(ecx, var->name()); |
__ mov(edx, 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) { |
@@ -1916,8 +1916,8 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) { |
__ pop(edx); |
} |
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. |
@@ -1956,8 +1956,8 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
// Record source code position before IC call. |
SetSourcePosition(expr->position()); |
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. |
@@ -3843,8 +3843,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
__ mov(ecx, prop->key()->AsLiteral()->handle()); |
__ pop(edx); |
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()) { |
@@ -3860,8 +3860,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
__ pop(ecx); |
__ pop(edx); |
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()) { |