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 9b5249db64af8deb3cd2c841edf2f76203b03e3c..50c89145d3f1fb0e113ac7f5fd0c52d8d9620487 100644 |
--- a/src/full-codegen/x64/full-codegen-x64.cc |
+++ b/src/full-codegen/x64/full-codegen-x64.cc |
@@ -717,9 +717,9 @@ void FullCodeGenerator::VisitVariableDeclaration( |
VariableDeclaration* declaration) { |
VariableProxy* proxy = declaration->proxy(); |
Variable* variable = proxy->var(); |
+ DCHECK(!variable->binding_needs_init()); |
switch (variable->location()) { |
case VariableLocation::UNALLOCATED: { |
- DCHECK(!variable->binding_needs_init()); |
globals_->Add(variable->name(), zone()); |
FeedbackVectorSlot slot = proxy->VariableFeedbackSlot(); |
DCHECK(!slot.IsInvalid()); |
@@ -729,22 +729,7 @@ void FullCodeGenerator::VisitVariableDeclaration( |
} |
case VariableLocation::PARAMETER: |
case VariableLocation::LOCAL: |
- if (variable->binding_needs_init()) { |
- Comment cmnt(masm_, "[ VariableDeclaration"); |
- __ LoadRoot(kScratchRegister, Heap::kTheHoleValueRootIndex); |
- __ movp(StackOperand(variable), kScratchRegister); |
- } |
- break; |
- |
case VariableLocation::CONTEXT: |
- if (variable->binding_needs_init()) { |
- Comment cmnt(masm_, "[ VariableDeclaration"); |
- EmitDebugCheckDeclarationContext(variable); |
- __ LoadRoot(kScratchRegister, Heap::kTheHoleValueRootIndex); |
- __ movp(ContextOperand(rsi, variable->index()), kScratchRegister); |
- // No write barrier since the hole value is in old space. |
- PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS); |
- } |
break; |
case VariableLocation::LOOKUP: |
@@ -1104,6 +1089,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy, |
SetExpressionPosition(proxy); |
PrepareForBailoutForId(proxy->BeforeId(), BailoutState::NO_REGISTERS); |
Variable* var = proxy->var(); |
+ DCHECK(!var->binding_needs_init()); |
// Two cases: global variable, and all other types of variables. |
switch (var->location()) { |
@@ -1120,20 +1106,6 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy, |
DCHECK_EQ(NOT_INSIDE_TYPEOF, typeof_mode); |
Comment cmnt(masm_, var->IsContextSlot() ? "[ Context slot" |
: "[ Stack slot"); |
- if (proxy->hole_check_mode() == HoleCheckMode::kRequired) { |
- // Throw a reference error when using an uninitialized let/const |
- // binding in harmony mode. |
- DCHECK(IsLexicalVariableMode(var->mode())); |
- Label done; |
- GetVar(rax, var); |
- __ CompareRoot(rax, Heap::kTheHoleValueRootIndex); |
- __ j(not_equal, &done, Label::kNear); |
- __ Push(var->name()); |
- __ CallRuntime(Runtime::kThrowReferenceError); |
- __ bind(&done); |
- context()->Plug(rax); |
- break; |
- } |
context()->Plug(var); |
break; |
} |
@@ -1445,8 +1417,7 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) { |
switch (assign_type) { |
case VARIABLE: { |
VariableProxy* proxy = expr->target()->AsVariableProxy(); |
- EmitVariableAssignment(proxy->var(), expr->op(), expr->AssignmentSlot(), |
- proxy->hole_check_mode()); |
+ EmitVariableAssignment(proxy->var(), expr->op(), expr->AssignmentSlot()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
context()->Plug(rax); |
break; |
@@ -1592,8 +1563,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, |
case VARIABLE: { |
VariableProxy* proxy = expr->AsVariableProxy(); |
EffectContext context(this); |
- EmitVariableAssignment(proxy->var(), Token::ASSIGN, slot, |
- proxy->hole_check_mode()); |
+ EmitVariableAssignment(proxy->var(), Token::ASSIGN, slot); |
break; |
} |
case NAMED_PROPERTY: { |
@@ -1634,59 +1604,22 @@ void FullCodeGenerator::EmitStoreToStackLocalOrContextSlot( |
} |
void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op, |
- FeedbackVectorSlot slot, |
- HoleCheckMode hole_check_mode) { |
+ FeedbackVectorSlot slot) { |
+ DCHECK(!var->binding_needs_init()); |
if (var->IsUnallocated()) { |
// Global var, const, or let. |
__ LoadGlobalObject(StoreDescriptor::ReceiverRegister()); |
CallStoreIC(slot, var->name()); |
- } else if (IsLexicalVariableMode(var->mode()) && op != Token::INIT) { |
- DCHECK(!var->IsLookupSlot()); |
- DCHECK(var->IsStackAllocated() || var->IsContextSlot()); |
- MemOperand location = VarOperand(var, rcx); |
- // Perform an initialization check for lexically declared variables. |
- if (hole_check_mode == HoleCheckMode::kRequired) { |
- Label assign; |
- __ movp(rdx, location); |
- __ CompareRoot(rdx, Heap::kTheHoleValueRootIndex); |
- __ j(not_equal, &assign, Label::kNear); |
- __ Push(var->name()); |
- __ CallRuntime(Runtime::kThrowReferenceError); |
- __ bind(&assign); |
- } |
- if (var->mode() != CONST) { |
- EmitStoreToStackLocalOrContextSlot(var, location); |
- } else if (var->throw_on_const_assignment(language_mode())) { |
+ } else if (var->mode() == CONST && op != Token::INIT) { |
+ 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. |
- DCHECK(var->IsStackAllocated() || var->IsContextSlot()); |
- Label uninitialized_this; |
- MemOperand location = VarOperand(var, rcx); |
- __ movp(rdx, location); |
- __ CompareRoot(rdx, Heap::kTheHoleValueRootIndex); |
- __ j(equal, &uninitialized_this); |
- __ Push(var->name()); |
- __ CallRuntime(Runtime::kThrowReferenceError); |
- __ bind(&uninitialized_this); |
- EmitStoreToStackLocalOrContextSlot(var, location); |
- |
} else { |
- DCHECK(var->mode() != CONST || op == Token::INIT); |
+ DCHECK(!var->is_this()); |
DCHECK(var->IsStackAllocated() || var->IsContextSlot()); |
DCHECK(!var->IsLookupSlot()); |
- // Assignment to var or initializing assignment to let/const in harmony |
- // mode. |
MemOperand location = VarOperand(var, rcx); |
- if (FLAG_debug_code && var->mode() == LET && op == Token::INIT) { |
- // Check for an uninitialized let binding. |
- __ movp(rdx, location); |
- __ CompareRoot(rdx, Heap::kTheHoleValueRootIndex); |
- __ Check(equal, kLetBindingReInitialization); |
- } |
EmitStoreToStackLocalOrContextSlot(var, location); |
} |
} |
@@ -2423,8 +2356,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
if (expr->is_postfix()) { |
// Perform the assignment as if via '='. |
{ EffectContext context(this); |
- EmitVariableAssignment(proxy->var(), Token::ASSIGN, expr->CountSlot(), |
- proxy->hole_check_mode()); |
+ EmitVariableAssignment(proxy->var(), Token::ASSIGN, |
+ expr->CountSlot()); |
PrepareForBailoutForId(expr->AssignmentId(), |
BailoutState::TOS_REGISTER); |
context.Plug(rax); |
@@ -2436,8 +2369,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
} |
} else { |
// Perform the assignment as if via '='. |
- EmitVariableAssignment(proxy->var(), Token::ASSIGN, expr->CountSlot(), |
- proxy->hole_check_mode()); |
+ EmitVariableAssignment(proxy->var(), Token::ASSIGN, expr->CountSlot()); |
PrepareForBailoutForId(expr->AssignmentId(), |
BailoutState::TOS_REGISTER); |
context()->Plug(rax); |