Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Unified Diff: src/full-codegen/arm/full-codegen-arm.cc

Issue 2615033002: [fullcodegen] Remove dead hole check logic (Closed)
Patch Set: x87 Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/compiler/ast-graph-builder.cc ('k') | src/full-codegen/arm64/full-codegen-arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/full-codegen/arm/full-codegen-arm.cc
diff --git a/src/full-codegen/arm/full-codegen-arm.cc b/src/full-codegen/arm/full-codegen-arm.cc
index ef569de3015f96613f26c6fdd6db298798d8a018..8c90b948cbd953c795310fcf1eff61ee790145ce 100644
--- a/src/full-codegen/arm/full-codegen-arm.cc
+++ b/src/full-codegen/arm/full-codegen-arm.cc
@@ -755,9 +755,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());
@@ -767,22 +767,7 @@ void FullCodeGenerator::VisitVariableDeclaration(
}
case VariableLocation::PARAMETER:
case VariableLocation::LOCAL:
- if (variable->binding_needs_init()) {
- Comment cmnt(masm_, "[ VariableDeclaration");
- __ LoadRoot(r0, Heap::kTheHoleValueRootIndex);
- __ str(r0, StackOperand(variable));
- }
- break;
-
case VariableLocation::CONTEXT:
- if (variable->binding_needs_init()) {
- Comment cmnt(masm_, "[ VariableDeclaration");
- EmitDebugCheckDeclarationContext(variable);
- __ LoadRoot(r0, Heap::kTheHoleValueRootIndex);
- __ str(r0, ContextMemOperand(cp, variable->index()));
- // No write barrier since the_hole_value is in old space.
- PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);
- }
break;
case VariableLocation::LOOKUP:
@@ -1147,6 +1132,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 variables and all other types of variables.
switch (var->location()) {
@@ -1163,20 +1149,6 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy,
DCHECK_EQ(NOT_INSIDE_TYPEOF, typeof_mode);
Comment cmnt(masm_, var->IsContextSlot() ? "[ Context variable"
: "[ Stack variable");
- if (proxy->hole_check_mode() == HoleCheckMode::kRequired) {
- // Throw a reference error when using an uninitialized let/const
- // binding in harmony mode.
- Label done;
- GetVar(r0, var);
- __ CompareRoot(r0, Heap::kTheHoleValueRootIndex);
- __ b(ne, &done);
- __ mov(r0, Operand(var->name()));
- __ push(r0);
- __ CallRuntime(Runtime::kThrowReferenceError);
- __ bind(&done);
- context()->Plug(r0);
- break;
- }
context()->Plug(var);
break;
}
@@ -1492,8 +1464,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(r0);
break;
@@ -1675,8 +1646,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: {
@@ -1719,60 +1689,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, r1);
- // Perform an initialization check for lexically declared variables.
- if (hole_check_mode == HoleCheckMode::kRequired) {
- Label assign;
- __ ldr(r3, location);
- __ CompareRoot(r3, Heap::kTheHoleValueRootIndex);
- __ b(ne, &assign);
- __ mov(r3, Operand(var->name()));
- __ push(r3);
- __ 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, r1);
- __ ldr(r3, location);
- __ CompareRoot(r3, Heap::kTheHoleValueRootIndex);
- __ b(eq, &uninitialized_this);
- __ mov(r0, Operand(var->name()));
- __ Push(r0);
- __ 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, r1);
- if (FLAG_debug_code && var->mode() == LET && op == Token::INIT) {
- // Check for an uninitialized let binding.
- __ ldr(r2, location);
- __ CompareRoot(r2, Heap::kTheHoleValueRootIndex);
- __ Check(eq, kLetBindingReInitialization);
- }
EmitStoreToStackLocalOrContextSlot(var, location);
}
}
@@ -2504,8 +2436,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
VariableProxy* proxy = expr->expression()->AsVariableProxy();
if (expr->is_postfix()) {
{ 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(r0);
@@ -2516,8 +2448,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
context()->PlugTOS();
}
} else {
- 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(r0);
« no previous file with comments | « src/compiler/ast-graph-builder.cc ('k') | src/full-codegen/arm64/full-codegen-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698