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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/crankshaft/hydrogen.cc

Issue 2622783002: [crankshaft] Remove dead Variable hole-checking code (Closed)
Patch Set: Update golden files 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/crankshaft/arm64/lithium-codegen-arm64.cc ('k') | src/crankshaft/hydrogen-instructions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/crankshaft/hydrogen.cc
diff --git a/src/crankshaft/hydrogen.cc b/src/crankshaft/hydrogen.cc
index 2d0f755e4e3bf874ea2c3c8e01ec0d9ca85b18b3..793de2a5cc1ec14113d661aaaf2665e9d6260563 100644
--- a/src/crankshaft/hydrogen.cc
+++ b/src/crankshaft/hydrogen.cc
@@ -4243,8 +4243,7 @@ void HOptimizedGraphBuilder::VisitBlock(Block* stmt) {
if (declaration_scope->is_script_scope() ||
declaration_scope->is_eval_scope()) {
function = new (zone())
- HLoadContextSlot(outer_context, Context::CLOSURE_INDEX,
- HLoadContextSlot::kNoCheck);
+ HLoadContextSlot(outer_context, Context::CLOSURE_INDEX);
} else {
function = New<HThisFunction>();
}
@@ -5236,12 +5235,9 @@ void HOptimizedGraphBuilder::VisitVariableProxy(VariableProxy* expr) {
DCHECK(current_block() != NULL);
DCHECK(current_block()->HasPredecessor());
Variable* variable = expr->var();
+ DCHECK(!variable->binding_needs_init());
switch (variable->location()) {
case VariableLocation::UNALLOCATED: {
- if (IsLexicalVariableMode(variable->mode())) {
- // TODO(rossberg): should this be an DCHECK?
- return Bailout(kReferenceToGlobalLexicalVariable);
- }
// Handle known global constants like 'undefined' specially to avoid a
// load from a global cell for them.
Handle<Object> constant_value =
@@ -5303,28 +5299,13 @@ void HOptimizedGraphBuilder::VisitVariableProxy(VariableProxy* expr) {
case VariableLocation::PARAMETER:
case VariableLocation::LOCAL: {
HValue* value = LookupAndMakeLive(variable);
- if (value == graph()->GetConstantHole()) {
- DCHECK(IsDeclaredVariableMode(variable->mode()) &&
- variable->mode() != VAR);
- return Bailout(kReferenceToUninitializedVariable);
- }
return ast_context()->ReturnValue(value);
}
case VariableLocation::CONTEXT: {
HValue* context = BuildContextChainWalk(variable);
- HLoadContextSlot::Mode mode;
- switch (variable->mode()) {
- case LET:
- case CONST:
- mode = HLoadContextSlot::kCheckDeoptimize;
- break;
- default:
- mode = HLoadContextSlot::kNoCheck;
- break;
- }
HLoadContextSlot* instr =
- new(zone()) HLoadContextSlot(context, variable->index(), mode);
+ new (zone()) HLoadContextSlot(context, variable->index());
return ast_context()->ReturnInstruction(instr, expr->id());
}
@@ -6542,9 +6523,7 @@ void HOptimizedGraphBuilder::HandleCompoundAssignment(Assignment* expr) {
if (proxy != NULL) {
Variable* var = proxy->var();
- if (var->mode() == LET) {
- return Bailout(kUnsupportedLetCompoundAssignment);
- }
+ DCHECK(!var->binding_needs_init());
CHECK_ALIVE(VisitForValue(operation));
@@ -6578,25 +6557,17 @@ void HOptimizedGraphBuilder::HandleCompoundAssignment(Assignment* expr) {
}
}
- HStoreContextSlot::Mode mode;
-
- switch (var->mode()) {
- case LET:
- mode = HStoreContextSlot::kCheckDeoptimize;
- break;
- case CONST:
- if (var->throw_on_const_assignment(function_language_mode())) {
- return Bailout(kNonInitializerAssignmentToConst);
- } else {
- return ast_context()->ReturnValue(Pop());
- }
- default:
- mode = HStoreContextSlot::kNoCheck;
+ if (var->mode() == CONST) {
+ if (var->throw_on_const_assignment(function_language_mode())) {
+ return Bailout(kNonInitializerAssignmentToConst);
+ } else {
+ return ast_context()->ReturnValue(Pop());
+ }
}
HValue* context = BuildContextChainWalk(var);
- HStoreContextSlot* instr = Add<HStoreContextSlot>(
- context, var->index(), mode, Top());
+ HStoreContextSlot* instr =
+ Add<HStoreContextSlot>(context, var->index(), Top());
if (instr->HasObservableSideEffects()) {
Add<HSimulate>(expr->AssignmentId(), REMOVABLE_SIMULATE);
}
@@ -6654,15 +6625,14 @@ void HOptimizedGraphBuilder::VisitAssignment(Assignment* expr) {
HandlePropertyAssignment(expr);
} else if (proxy != NULL) {
Variable* var = proxy->var();
+ DCHECK(!var->binding_needs_init());
- if (var->mode() == CONST) {
- if (expr->op() != Token::INIT) {
- if (var->throw_on_const_assignment(function_language_mode())) {
- return Bailout(kNonInitializerAssignmentToConst);
- } else {
- CHECK_ALIVE(VisitForValue(expr->value()));
- return ast_context()->ReturnValue(Pop());
- }
+ if (var->mode() == CONST && expr->op() != Token::INIT) {
+ if (var->throw_on_const_assignment(function_language_mode())) {
+ return Bailout(kNonInitializerAssignmentToConst);
+ } else {
+ CHECK_ALIVE(VisitForValue(expr->value()));
+ return ast_context()->ReturnValue(Pop());
}
}
@@ -6676,14 +6646,6 @@ void HOptimizedGraphBuilder::VisitAssignment(Assignment* expr) {
case VariableLocation::PARAMETER:
case VariableLocation::LOCAL: {
- // Perform an initialization check for let declared variables
- // or parameters.
- if (var->mode() == LET && expr->op() == Token::ASSIGN) {
- HValue* env_value = environment()->Lookup(var);
- if (env_value == graph()->GetConstantHole()) {
- return Bailout(kAssignmentToLetVariableBeforeInitialization);
- }
- }
// We do not allow the arguments object to occur in a context where it
// may escape, but assignments to stack-allocated locals are
// permitted.
@@ -6709,29 +6671,9 @@ void HOptimizedGraphBuilder::VisitAssignment(Assignment* expr) {
}
CHECK_ALIVE(VisitForValue(expr->value()));
- HStoreContextSlot::Mode mode;
- if (expr->op() == Token::ASSIGN) {
- switch (var->mode()) {
- case LET:
- mode = HStoreContextSlot::kCheckDeoptimize;
- break;
- case CONST:
- // If we reached this point, the only possibility
- // is a sloppy assignment to a function name.
- DCHECK(function_language_mode() == SLOPPY &&
- !var->throw_on_const_assignment(SLOPPY));
- return ast_context()->ReturnValue(Pop());
- default:
- mode = HStoreContextSlot::kNoCheck;
- }
- } else {
- DCHECK_EQ(Token::INIT, expr->op());
- mode = HStoreContextSlot::kNoCheck;
- }
-
HValue* context = BuildContextChainWalk(var);
- HStoreContextSlot* instr = Add<HStoreContextSlot>(
- context, var->index(), mode, Top());
+ HStoreContextSlot* instr =
+ Add<HStoreContextSlot>(context, var->index(), Top());
if (instr->HasObservableSideEffects()) {
Add<HSimulate>(expr->AssignmentId(), REMOVABLE_SIMULATE);
}
@@ -10427,6 +10369,7 @@ void HOptimizedGraphBuilder::VisitCountOperation(CountOperation* expr) {
if (proxy != NULL) {
Variable* var = proxy->var();
+ DCHECK(!var->binding_needs_init());
if (var->mode() == CONST) {
return Bailout(kNonInitializerAssignmentToConst);
}
@@ -10451,10 +10394,8 @@ void HOptimizedGraphBuilder::VisitCountOperation(CountOperation* expr) {
case VariableLocation::CONTEXT: {
HValue* context = BuildContextChainWalk(var);
- HStoreContextSlot::Mode mode = IsLexicalVariableMode(var->mode())
- ? HStoreContextSlot::kCheckDeoptimize : HStoreContextSlot::kNoCheck;
- HStoreContextSlot* instr = Add<HStoreContextSlot>(context, var->index(),
- mode, after);
+ HStoreContextSlot* instr =
+ Add<HStoreContextSlot>(context, var->index(), after);
if (instr->HasObservableSideEffects()) {
Add<HSimulate>(expr->AssignmentId(), REMOVABLE_SIMULATE);
}
@@ -11836,9 +11777,9 @@ void HOptimizedGraphBuilder::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());
@@ -11848,21 +11789,7 @@ void HOptimizedGraphBuilder::VisitVariableDeclaration(
}
case VariableLocation::PARAMETER:
case VariableLocation::LOCAL:
- if (variable->binding_needs_init()) {
- HValue* value = graph()->GetConstantHole();
- environment()->Bind(variable, value);
- }
- break;
case VariableLocation::CONTEXT:
- if (variable->binding_needs_init()) {
- HValue* value = graph()->GetConstantHole();
- HValue* context = environment()->context();
- HStoreContextSlot* store = Add<HStoreContextSlot>(
- context, variable->index(), HStoreContextSlot::kNoCheck, value);
- if (store->HasObservableSideEffects()) {
- Add<HSimulate>(proxy->id(), REMOVABLE_SIMULATE);
- }
- }
break;
case VariableLocation::LOOKUP:
return Bailout(kUnsupportedLookupSlotInDeclaration);
@@ -11900,8 +11827,8 @@ void HOptimizedGraphBuilder::VisitFunctionDeclaration(
CHECK_ALIVE(VisitForValue(declaration->fun()));
HValue* value = Pop();
HValue* context = environment()->context();
- HStoreContextSlot* store = Add<HStoreContextSlot>(
- context, variable->index(), HStoreContextSlot::kNoCheck, value);
+ HStoreContextSlot* store =
+ Add<HStoreContextSlot>(context, variable->index(), value);
if (store->HasObservableSideEffects()) {
Add<HSimulate>(proxy->id(), REMOVABLE_SIMULATE);
}
« no previous file with comments | « src/crankshaft/arm64/lithium-codegen-arm64.cc ('k') | src/crankshaft/hydrogen-instructions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698