Get rid of dead RemoveTemporary

src/ast/scopes.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/ast/scopes.h"
 
 #include <set>
 
 #include "src/accessors.h"
 #include "src/bootstrapper.h"
@@ skipping 691 matching lines @@
   DeclarationScope* scope = GetClosureScope();
   Variable* var = new(zone()) Variable(scope,
                                        name,
                                        TEMPORARY,
                                        Variable::NORMAL,
                                        kCreatedInitialized);
   scope->AddTemporary(var);
   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());
 }
 
 
 Declaration* Scope::CheckConflictingVarDeclarations() {
   int length = decls_.length();
   for (int i = 0; i < length; i++) {
     Declaration* decl = decls_[i];
@@ skipping 62 matching lines @@
   DCHECK(stack_locals != NULL);
   DCHECK(context_locals != NULL);
   DCHECK(context_globals != NULL);
 
   // Collect temporaries which are always allocated on the stack, unless the
   // context as a whole has forced context allocation.
   if (is_declaration_scope()) {
     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());
           context_locals->Add(var, zone());
         } else if (var->IsStackLocal()) {
           stack_locals->Add(var, zone());
         } else {
           DCHECK(var->IsParameter());
         }
       }
@@ skipping 356 matching lines @@
   // Print locals.
   if (function != nullptr) {
     Indent(n1, "// function var:\n");
     PrintVar(n1, function);
   }
 
   if (is_declaration_scope()) {
     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]);
     }
   }
 
   if (variables_.Start() != NULL) {
     Indent(n1, "// local vars:\n");
     PrintMap(n1, &variables_);
   }
 
   if (dynamics_ != NULL) {
     Indent(n1, "// dynamic vars:\n");
@@ skipping 444 matching lines @@
     }
   }
 }
 
 void Scope::AllocateNonParameterLocalsAndDeclaredGlobals(
     AstValueFactory* ast_value_factory) {
   // All variables that have no rewrite yet are non-parameter locals.
   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);
     }
   }
 
   ZoneList<VarAndOrder> vars(variables_.occupancy(), zone());
   for (VariableMap::Entry* p = variables_.Start();
        p != NULL;
        p = variables_.Next(p)) {
     Variable* var = reinterpret_cast<Variable*>(p->value);
     vars.Add(VarAndOrder(var, p->order), zone());
@@ skipping 115 matching lines @@
       function != nullptr && function->IsContextSlot();
   return num_heap_slots() - Context::MIN_CONTEXT_SLOTS - num_global_slots() -
          (is_function_var_in_context ? 1 : 0);
 }
 
 
 int Scope::ContextGlobalCount() const { return num_global_slots(); }
 
 }  // namespace internal
 }  // namespace v8