Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index 3a93117e385542c259016c087242a171bed3c289..9f66ab2a9387a3c52b361bce3914ffaac7559eab 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -114,7 +114,7 @@ void FullCodeGenerator::Generate() { |
// Sloppy mode functions and builtins need to replace the receiver with the |
// global proxy when called as functions (without an explicit receiver |
// object). |
- if (info->strict_mode() == SLOPPY && !info->is_native()) { |
+ if (!is_strict(info->language_mode()) && !info->is_native()) { |
Label ok; |
// +1 for return address. |
StackArgumentsAccessor args(rsp, info->scope()->num_parameters()); |
@@ -255,7 +255,7 @@ void FullCodeGenerator::Generate() { |
// The stub will rewrite receiver and parameter count if the previous |
// stack frame was an arguments adapter frame. |
ArgumentsAccessStub::Type type; |
- if (strict_mode() == STRICT) { |
+ if (is_strict(language_mode())) { |
type = ArgumentsAccessStub::NEW_STRICT; |
} else if (function()->has_duplicate_parameters()) { |
type = ArgumentsAccessStub::NEW_SLOPPY_SLOW; |
@@ -1256,7 +1256,7 @@ void FullCodeGenerator::EmitNewClosure(Handle<SharedFunctionInfo> info, |
!pretenure && |
scope()->is_function_scope() && |
info->num_literals() == 0) { |
- FastNewClosureStub stub(isolate(), info->strict_mode(), info->kind()); |
+ FastNewClosureStub stub(isolate(), info->language_mode(), info->kind()); |
__ Move(rbx, info); |
__ CallStub(&stub); |
} else { |
@@ -1699,7 +1699,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
VisitForStackValue(value); |
if (property->emit_store()) { |
EmitSetHomeObjectIfNeeded(value, 2); |
- __ Push(Smi::FromInt(SLOPPY)); // Strict mode |
+ __ Push(Smi::FromInt(SLOPPY)); // Language mode |
__ CallRuntime(Runtime::kSetProperty, 4); |
} else { |
__ Drop(3); |
@@ -2570,7 +2570,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) { |
__ Pop(StoreDescriptor::ReceiverRegister()); |
__ Pop(StoreDescriptor::ValueRegister()); // Restore value. |
Handle<Code> ic = |
- CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code(); |
+ CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
CallIC(ic); |
break; |
} |
@@ -2637,7 +2637,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, |
__ Push(rax); // Value. |
__ Push(rsi); // Context. |
__ Push(var->name()); |
- __ Push(Smi::FromInt(strict_mode())); |
+ __ Push(Smi::FromInt(language_mode())); |
__ CallRuntime(Runtime::kStoreLookupSlot, 4); |
} else { |
// Assignment to var or initializing assignment to let/const in harmony |
@@ -2652,7 +2652,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, |
} |
EmitStoreToStackLocalOrContextSlot(var, location); |
} |
- } else if (IsSignallingAssignmentToConst(var, op, strict_mode())) { |
+ } else if (IsSignallingAssignmentToConst(var, op, language_mode())) { |
__ CallRuntime(Runtime::kThrowConstAssignError, 0); |
} |
} |
@@ -2685,8 +2685,8 @@ void FullCodeGenerator::EmitNamedSuperPropertyStore(Property* prop) { |
__ Push(key->value()); |
__ Push(rax); |
- __ CallRuntime((strict_mode() == STRICT ? Runtime::kStoreToSuper_Strict |
- : Runtime::kStoreToSuper_Sloppy), |
+ __ CallRuntime((is_strict(language_mode()) ? Runtime::kStoreToSuper_Strict |
+ : Runtime::kStoreToSuper_Sloppy), |
4); |
} |
@@ -2698,9 +2698,10 @@ void FullCodeGenerator::EmitKeyedSuperPropertyStore(Property* prop) { |
DCHECK(prop != NULL); |
__ Push(rax); |
- __ CallRuntime((strict_mode() == STRICT ? Runtime::kStoreKeyedToSuper_Strict |
- : Runtime::kStoreKeyedToSuper_Sloppy), |
- 4); |
+ __ CallRuntime( |
+ (is_strict(language_mode()) ? Runtime::kStoreKeyedToSuper_Strict |
+ : Runtime::kStoreKeyedToSuper_Sloppy), |
+ 4); |
} |
@@ -2712,7 +2713,8 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
DCHECK(StoreDescriptor::ValueRegister().is(rax)); |
// Record source code position before IC call. |
SetSourcePosition(expr->position()); |
- Handle<Code> ic = CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code(); |
+ Handle<Code> ic = |
+ CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
CallIC(ic, expr->AssignmentFeedbackId()); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
@@ -2933,7 +2935,7 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
__ Push(args.GetReceiverOperand()); |
// Push the language mode. |
- __ Push(Smi::FromInt(strict_mode())); |
+ __ Push(Smi::FromInt(language_mode())); |
// Push the start position of the scope the calls resides in. |
__ Push(Smi::FromInt(scope()->start_position())); |
@@ -4514,14 +4516,14 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { |
if (property != NULL) { |
VisitForStackValue(property->obj()); |
VisitForStackValue(property->key()); |
- __ Push(Smi::FromInt(strict_mode())); |
+ __ Push(Smi::FromInt(language_mode())); |
__ InvokeBuiltin(Builtins::DELETE, CALL_FUNCTION); |
context()->Plug(rax); |
} else if (proxy != NULL) { |
Variable* var = proxy->var(); |
// Delete of an unqualified identifier is disallowed in strict mode |
// but "delete this" is allowed. |
- DCHECK(strict_mode() == SLOPPY || var->is_this()); |
+ DCHECK(!is_strict(language_mode()) || var->is_this()); |
if (var->IsUnallocated()) { |
__ Push(GlobalObjectOperand()); |
__ Push(var->name()); |
@@ -4845,7 +4847,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
__ Pop(StoreDescriptor::NameRegister()); |
__ Pop(StoreDescriptor::ReceiverRegister()); |
Handle<Code> ic = |
- CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code(); |
+ CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
CallIC(ic, expr->CountStoreFeedbackId()); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
if (expr->is_postfix()) { |