Index: src/mips/full-codegen-mips.cc |
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc |
index 914fdfbfed3cf47893100202a37fc70dfdf5ee49..4ad24e882984674342b859d7d09f44314b303b8c 100644 |
--- a/src/mips/full-codegen-mips.cc |
+++ b/src/mips/full-codegen-mips.cc |
@@ -134,7 +134,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_sloppy(info->language_mode()) && !info->is_native()) { |
Label ok; |
int receiver_offset = info->scope()->num_parameters() * kPointerSize; |
__ lw(at, MemOperand(sp, receiver_offset)); |
@@ -272,7 +272,7 @@ void FullCodeGenerator::Generate() { |
// The stub will rewrite receiever 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; |
@@ -1287,7 +1287,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()); |
__ li(a2, Operand(info)); |
__ CallStub(&stub); |
} else { |
@@ -2641,7 +2641,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) { |
__ Pop(StoreDescriptor::ValueRegister(), |
StoreDescriptor::ReceiverRegister()); |
Handle<Code> ic = |
- CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code(); |
+ CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
CallIC(ic); |
break; |
} |
@@ -2708,8 +2708,8 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op) { |
if (var->IsLookupSlot()) { |
// Assignment to var. |
__ li(a1, Operand(var->name())); |
- __ li(a0, Operand(Smi::FromInt(strict_mode()))); |
- __ Push(v0, cp, a1, a0); // Value, context, name, strict mode. |
+ __ li(a0, Operand(Smi::FromInt(language_mode()))); |
+ __ Push(v0, cp, a1, a0); // Value, context, name, language mode. |
__ CallRuntime(Runtime::kStoreLookupSlot, 4); |
} else { |
// Assignment to var or initializing assignment to let/const in harmony |
@@ -2724,7 +2724,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op) { |
} |
EmitStoreToStackLocalOrContextSlot(var, location); |
} |
- } else if (IsSignallingAssignmentToConst(var, op, strict_mode())) { |
+ } else if (IsSignallingAssignmentToConst(var, op, language_mode())) { |
__ CallRuntime(Runtime::kThrowConstAssignError, 0); |
} |
} |
@@ -2759,8 +2759,8 @@ void FullCodeGenerator::EmitNamedSuperPropertyStore(Property* prop) { |
__ Push(key->value()); |
__ Push(v0); |
- __ CallRuntime((strict_mode() == STRICT ? Runtime::kStoreToSuper_Strict |
- : Runtime::kStoreToSuper_Sloppy), |
+ __ CallRuntime((is_strict(language_mode()) ? Runtime::kStoreToSuper_Strict |
+ : Runtime::kStoreToSuper_Sloppy), |
4); |
} |
@@ -2772,9 +2772,10 @@ void FullCodeGenerator::EmitKeyedSuperPropertyStore(Property* prop) { |
DCHECK(prop != NULL); |
__ Push(v0); |
- __ CallRuntime((strict_mode() == STRICT ? Runtime::kStoreKeyedToSuper_Strict |
- : Runtime::kStoreKeyedToSuper_Sloppy), |
- 4); |
+ __ CallRuntime( |
+ (is_strict(language_mode()) ? Runtime::kStoreKeyedToSuper_Strict |
+ : Runtime::kStoreKeyedToSuper_Sloppy), |
+ 4); |
} |
@@ -2792,7 +2793,8 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
__ Pop(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister()); |
DCHECK(StoreDescriptor::ValueRegister().is(a0)); |
- 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); |
@@ -3010,8 +3012,8 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
int receiver_offset = 2 + info_->scope()->num_parameters(); |
__ lw(t1, MemOperand(fp, receiver_offset * kPointerSize)); |
- // t0: the strict mode. |
- __ li(t0, Operand(Smi::FromInt(strict_mode()))); |
+ // t0: the language mode. |
+ __ li(t0, Operand(Smi::FromInt(language_mode()))); |
// a1: the start position of the scope the calls resides in. |
__ li(a1, Operand(Smi::FromInt(scope()->start_position()))); |
@@ -4575,7 +4577,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { |
if (property != NULL) { |
VisitForStackValue(property->obj()); |
VisitForStackValue(property->key()); |
- __ li(a1, Operand(Smi::FromInt(strict_mode()))); |
+ __ li(a1, Operand(Smi::FromInt(language_mode()))); |
__ push(a1); |
__ InvokeBuiltin(Builtins::DELETE, CALL_FUNCTION); |
context()->Plug(v0); |
@@ -4583,7 +4585,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { |
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_sloppy(language_mode()) || var->is_this()); |
if (var->IsUnallocated()) { |
__ lw(a2, GlobalObjectOperand()); |
__ li(a1, Operand(var->name())); |
@@ -4906,7 +4908,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
__ Pop(StoreDescriptor::ReceiverRegister(), |
StoreDescriptor::NameRegister()); |
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()) { |