AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Get rid of dead RemoveTemporary

Browse Source 
kudos to marja@ for finding this

BUG=v8:5209

Review-Url: https://codereview.chromium.org/2243833002
Cr-Commit-Position: refs/heads/master@{#38619}
This commit is contained in:
verwaest 2016-08-12 06:34:01 -07:00 committed by Commit bot
parent b167ae3361
commit 0a93ebaa76
2 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ast/scopes.cc
View File

@ -709,28 +709,6 @@ Variable* Scope::NewTemporary(const AstRawString* name) {
return var;
}
int DeclarationScope::RemoveTemporary(Variable* var) {
DCHECK(!already_resolved());
DCHECK_NOT_NULL(var);
// Temporaries are only placed in ClosureScopes.
DCHECK_EQ(GetClosureScope(), this);
DCHECK_EQ(var->scope()->GetClosureScope(), var->scope());
// If the temporary is not here, return quickly.
if (var->scope() != this) return -1;
// Most likely (always?) any temporary variable we want to remove
// was just added before, so we search backwards.
for (int i = temps_.length(); i-- > 0;) {
if (temps_[i] == var) {
// Don't shrink temps_, as callers of this method expect
// the returned indices to be unique per-scope.
temps_[i] = nullptr;
return i;
}
}
return -1;
}
void Scope::AddDeclaration(Declaration* declaration) {
DCHECK(!already_resolved());
decls_.Add(declaration, zone());
@ -813,7 +791,6 @@ void Scope::CollectStackAndContextLocals(ZoneList<Variable*>* stack_locals,
ZoneList<Variable*>* temps = AsDeclarationScope()->temps();
for (int i = 0; i < temps->length(); i++) {
Variable* var = (*temps)[i];
if (var == nullptr) continue;
if (var->is_used()) {
if (var->IsContextSlot()) {
DCHECK(has_forced_context_allocation());
@ -1190,13 +1167,11 @@ void Scope::Print(int n) {
bool printed_header = false;
ZoneList<Variable*>* temps = AsDeclarationScope()->temps();
for (int i = 0; i < temps->length(); i++) {
if ((*temps)[i] != nullptr) {
if (!printed_header) {
printed_header = true;
Indent(n1, "// temporary vars:\n");
}
PrintVar(n1, (*temps)[i]);
if (!printed_header) {
printed_header = true;
Indent(n1, "// temporary vars:\n");
}
PrintVar(n1, (*temps)[i]);
}
}
@ -1661,7 +1636,6 @@ void Scope::AllocateNonParameterLocalsAndDeclaredGlobals(
if (is_declaration_scope()) {
ZoneList<Variable*>* temps = AsDeclarationScope()->temps();
for (int i = 0; i < temps->length(); i++) {
if ((*temps)[i] == nullptr) continue;
AllocateNonParameterLocal((*temps)[i], ast_value_factory);
}
}

10
src/ast/scopes.h
View File

@ -800,12 +800,6 @@ class DeclarationScope : public Scope {
return this_function_;
}
// Remove a temporary variable. This is for adjusting the scope of
// temporaries used when desugaring parameter initializers.
// Returns the index at which it was found in this scope, or -1 if
// it was not found.
int RemoveTemporary(Variable* var);
// Adds a temporary variable in this scope's TemporaryScope. This is for
// adjusting the scope of temporaries used when desugaring parameter
// initializers.
@ -873,9 +867,7 @@ class DeclarationScope : public Scope {
int arity_;
int rest_index_;
Variable* rest_parameter_;
// Compiler-allocated (user-invisible) temporaries. Due to the implementation
// of RemoveTemporary(), may contain nulls, which must be skipped-over during
// allocation and printing.
// Compiler-allocated (user-invisible) temporaries.
ZoneList<Variable*> temps_;
// Parameter list in source order.
ZoneList<Variable*> params_;