Index: src/full-codegen/x87/full-codegen-x87.cc |
diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc |
index cd7e4aa13fd614d17102ade9e0ff9f03bf3a8b6a..319e92297d65fb370e11081f6db5e4c8904a473b 100644 |
--- a/src/full-codegen/x87/full-codegen-x87.cc |
+++ b/src/full-codegen/x87/full-codegen-x87.cc |
@@ -2067,10 +2067,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) { |
// Initializing assignment to const {this} needs a write barrier. |
@@ -2085,7 +2085,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(Immediate(var->name())); |
@@ -2106,13 +2107,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. |
} |
} |