Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index 6805b54b907076d849991d3c5af85023e426abd4..2416694d079c70935b771ec807877b5b2724f0da 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -2635,25 +2635,6 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, |
__ movp(StoreDescriptor::ReceiverRegister(), GlobalObjectOperand()); |
CallStoreIC(); |
- } else if (op == Token::INIT_CONST_LEGACY) { |
- // Const initializers need a write barrier. |
- DCHECK(!var->IsParameter()); // No const parameters. |
- if (var->IsLookupSlot()) { |
- __ Push(rax); |
- __ Push(rsi); |
- __ Push(var->name()); |
- __ CallRuntime(Runtime::kInitializeLegacyConstLookupSlot, 3); |
- } else { |
- DCHECK(var->IsStackLocal() || var->IsContextSlot()); |
- Label skip; |
- MemOperand location = VarOperand(var, rcx); |
- __ movp(rdx, location); |
- __ CompareRoot(rdx, Heap::kTheHoleValueRootIndex); |
- __ j(not_equal, &skip); |
- EmitStoreToStackLocalOrContextSlot(var, location); |
- __ bind(&skip); |
- } |
- |
} else if (var->mode() == LET && op != Token::INIT_LET) { |
// Non-initializing assignment to let variable needs a write barrier. |
DCHECK(!var->IsLookupSlot()); |
@@ -2668,6 +2649,20 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, |
__ bind(&assign); |
EmitStoreToStackLocalOrContextSlot(var, location); |
+ } else if (var->mode() == CONST && op != Token::INIT_CONST) { |
+ // Assignment to const variable needs a write barrier. |
+ DCHECK(!var->IsLookupSlot()); |
+ DCHECK(var->IsStackAllocated() || var->IsContextSlot()); |
+ Label const_error; |
+ MemOperand location = VarOperand(var, rcx); |
+ __ movp(rdx, location); |
+ __ CompareRoot(rdx, Heap::kTheHoleValueRootIndex); |
+ __ j(not_equal, &const_error, Label::kNear); |
+ __ Push(var->name()); |
+ __ CallRuntime(Runtime::kThrowReferenceError, 1); |
+ __ bind(&const_error); |
+ __ CallRuntime(Runtime::kThrowConstAssignError, 0); |
+ |
} else if (!var->is_const_mode() || op == Token::INIT_CONST) { |
if (var->IsLookupSlot()) { |
// Assignment to var. |
@@ -2689,8 +2684,33 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, |
} |
EmitStoreToStackLocalOrContextSlot(var, location); |
} |
- } else if (IsSignallingAssignmentToConst(var, op, language_mode())) { |
- __ CallRuntime(Runtime::kThrowConstAssignError, 0); |
+ |
+ } else if (op == Token::INIT_CONST_LEGACY) { |
+ // Const initializers need a write barrier. |
+ DCHECK(var->mode() == CONST_LEGACY); |
+ DCHECK(!var->IsParameter()); // No const parameters. |
+ if (var->IsLookupSlot()) { |
+ __ Push(rax); |
+ __ Push(rsi); |
+ __ Push(var->name()); |
+ __ CallRuntime(Runtime::kInitializeLegacyConstLookupSlot, 3); |
+ } else { |
+ DCHECK(var->IsStackLocal() || var->IsContextSlot()); |
+ Label skip; |
+ MemOperand location = VarOperand(var, rcx); |
+ __ movp(rdx, location); |
+ __ CompareRoot(rdx, Heap::kTheHoleValueRootIndex); |
+ __ j(not_equal, &skip); |
+ EmitStoreToStackLocalOrContextSlot(var, location); |
+ __ bind(&skip); |
+ } |
+ |
+ } else { |
+ DCHECK(var->mode() == CONST_LEGACY && op != Token::INIT_CONST_LEGACY); |
+ if (is_strict(language_mode())) { |
+ __ CallRuntime(Runtime::kThrowConstAssignError, 0); |
+ } |
+ // Silently ignore store in sloppy mode. |
} |
} |