- GrowableArray::RemoveLast returns the value being removed

vm/flow_graph.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph.h"
 
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
@@ skipping 457 matching lines @@
   for (intptr_t var_index = 0; var_index < variable_count(); ++var_index) {
     // Add to the worklist each block containing an assignment.
     for (intptr_t block_index = 0; block_index < block_count; ++block_index) {
       if (assigned_vars[block_index]->Contains(var_index)) {
         work[block_index] = var_index;
         worklist.Add(preorder[block_index]);
       }
     }
 
     while (!worklist.is_empty()) {
-      BlockEntryInstr* current = worklist.Last();
-      worklist.RemoveLast();
+      BlockEntryInstr* current = worklist.RemoveLast();
       // Ensure a phi for each block in the dominance frontier of current.
       for (BitVector::Iterator it(dom_frontier[current->preorder_number()]);
            !it.Done();
            it.Advance()) {
         int index = it.Current();
         if (has_already[index] < var_index) {
           BlockEntryInstr* block = preorder[index];
           ASSERT(block->IsJoinEntry());
           block->AsJoinEntry()->InsertPhi(var_index, variable_count());
           has_already[index] = var_index;
@@ skipping 87 matching lines @@
 
     // 2a. Handle uses:
     // Update expression stack environment for each use.
     // For each use of a LoadLocal or StoreLocal: Replace it with the value
     // from the environment.
     for (intptr_t i = current->InputCount() - 1; i >= 0; --i) {
       Value* v = current->InputAt(i);
       // Update expression stack.
       ASSERT(env->length() > variable_count());
 
-      Definition* reaching_defn = env->Last();
-      env->RemoveLast();
+      Definition* reaching_defn = env->RemoveLast();
 
       Definition* input_defn = v->definition();
       if (input_defn->IsLoadLocal() || input_defn->IsStoreLocal()) {
         // Remove the load/store from the graph.
         input_defn->RemoveFromGraph();
         // Assert we are not referencing nulls in the initial environment.
         ASSERT(reaching_defn->ssa_temp_index() != -1);
         current->SetInputAt(i, new Value(reaching_defn));
       }
     }
@@ skipping 76 matching lines @@
           phi->SetInputAt(pred_index, new Value((*env)[i]));
         }
       }
     }
   }
 }
 
 
 void FlowGraph::MarkLivePhis(GrowableArray<PhiInstr*>* live_phis) {
   while (!live_phis->is_empty()) {
-    PhiInstr* phi = live_phis->Last();
-    live_phis->RemoveLast();
+    PhiInstr* phi = live_phis->RemoveLast();
     for (intptr_t i = 0; i < phi->InputCount(); i++) {
       Value* val = phi->InputAt(i);
       PhiInstr* used_phi = val->definition()->AsPhi();
       if ((used_phi != NULL) && !used_phi->is_alive()) {
         used_phi->mark_alive();
         live_phis->Add(used_phi);
       }
     }
   }
 }
 
 
 // Find the natural loop for the back edge m->n and attach loop information
 // to block n (loop header). The algorithm is described in "Advanced Compiler
 // Design & Implementation" (Muchnick) p192.
 static void FindLoop(BlockEntryInstr* m,
                      BlockEntryInstr* n,
                      intptr_t num_blocks) {
   GrowableArray<BlockEntryInstr*> stack;
   BitVector* loop = new BitVector(num_blocks);
 
   loop->Add(n->preorder_number());
   if (n != m) {
     loop->Add(m->preorder_number());
     stack.Add(m);
   }
 
   while (!stack.is_empty()) {
-    BlockEntryInstr* p = stack.Last();
-    stack.RemoveLast();
+    BlockEntryInstr* p = stack.RemoveLast();
     for (intptr_t i = 0; i < p->PredecessorCount(); ++i) {
       BlockEntryInstr* q = p->PredecessorAt(i);
       if (!loop->Contains(q->preorder_number())) {
         loop->Add(q->preorder_number());
         stack.Add(q);
       }
     }
   }
   n->set_loop_info(loop);
   if (FLAG_trace_optimization) {
@@ skipping 281 matching lines @@
          !it.Done();
          it.Advance()) {
       ++size;
     }
   }
   return size;
 }
 
 
 }  // namespace dart