| Index: src/full-codegen/x64/full-codegen-x64.cc
|
| diff --git a/src/full-codegen/x64/full-codegen-x64.cc b/src/full-codegen/x64/full-codegen-x64.cc
|
| index e491e98a2635096b40ee71938d03fb4c7e122560..25e8eb908a2580b6fdbba0f1778c8c4d462cfd59 100644
|
| --- a/src/full-codegen/x64/full-codegen-x64.cc
|
| +++ b/src/full-codegen/x64/full-codegen-x64.cc
|
| @@ -2090,10 +2090,10 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op,
|
| __ CallRuntime(Runtime::kThrowReferenceError);
|
| __ bind(&assign);
|
| }
|
| - if (var->mode() == CONST) {
|
| - __ CallRuntime(Runtime::kThrowConstAssignError);
|
| - } else {
|
| + if (var->mode() != CONST) {
|
| EmitStoreToStackLocalOrContextSlot(var, location);
|
| + } else if (var->throw_on_const_assignment(language_mode())) {
|
| + __ CallRuntime(Runtime::kThrowConstAssignError);
|
| }
|
|
|
| } else if (var->is_this() && var->mode() == CONST && op == Token::INIT) {
|
| @@ -2109,7 +2109,8 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op,
|
| __ bind(&uninitialized_this);
|
| EmitStoreToStackLocalOrContextSlot(var, location);
|
|
|
| - } else if (!var->is_const_mode() || op == Token::INIT) {
|
| + } else {
|
| + DCHECK(var->mode() != CONST || op == Token::INIT);
|
| if (var->IsLookupSlot()) {
|
| // Assignment to var.
|
| __ Push(var->name());
|
| @@ -2130,13 +2131,6 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op,
|
| }
|
| EmitStoreToStackLocalOrContextSlot(var, location);
|
| }
|
| -
|
| - } else {
|
| - DCHECK(var->mode() == CONST_LEGACY && op != Token::INIT);
|
| - if (is_strict(language_mode())) {
|
| - __ CallRuntime(Runtime::kThrowConstAssignError);
|
| - }
|
| - // Silently ignore store in sloppy mode.
|
| }
|
| }
|
|
|
|
|