Cleanups.

runtime/vm/flow_graph_builder.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_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
@@ skipping 2438 matching lines @@
   }
   ASSERT(var_count == (parsed_function().stack_local_count() +
                        parsed_function().function().num_fixed_parameters()));
 
   // Initialize start environment.
   ZoneGrowableArray<Value*>* start_env =
       new ZoneGrowableArray<Value*>(var_count);
   intptr_t i = 0;
   for (; i < parsed_function().function().num_fixed_parameters(); ++i) {
     ParameterInstr* param = new ParameterInstr(i);
-    param->set_ssa_temp_index(current_ssa_temp_index_++);  // New SSA temp.
+    param->set_ssa_temp_index(alloc_ssa_temp_index());  // New SSA temp.
     start_env->Add(new UseVal(param));
   }
 
   // All locals are initialized with #null.
   Value* null_value = new ConstantVal(Object::ZoneHandle());
   for (; i < var_count; i++) {
     start_env->Add(null_value);
   }
   graph_entry_->set_start_env(new Environment(start_env));
 
@@ skipping 27 matching lines @@
                                        ZoneGrowableArray<Value*>* env,
                                        intptr_t var_count) {
   // 1. Process phis first.
   if (block_entry->IsJoinEntry()) {
     JoinEntryInstr* join = block_entry->AsJoinEntry();
     if (join->phis() != NULL) {
       for (intptr_t i = 0; i < join->phis()->length(); ++i) {
         PhiInstr* phi = (*join->phis())[i];
         if (phi != NULL) {
           (*env)[i] = new UseVal(phi);
-          phi->set_ssa_temp_index(current_ssa_temp_index_++);  // New SSA temp.
+          phi->set_ssa_temp_index(alloc_ssa_temp_index());  // New SSA temp.
         }
       }
     }
   }
 
   // 2. Process normal instructions.
   for (ForwardInstructionIterator it(block_entry); !it.Done(); it.Advance()) {
     Instruction* current = it.Current();
     // Attach current environment to the instruction.
     // TODO(fschneider): Currently each instruction gets a full copy of the
@@ skipping 48 matching lines @@
         }
         // Update expression stack and remove from graph.
         if (bind->is_used()) {
           env->Add(CopyValue((*env)[index]));
         }
         it.RemoveCurrentFromGraph();
       } else {
         // Not a load or store.
         if (bind->is_used()) {
           // Assign fresh SSA temporary and update expression stack.
-          bind->set_ssa_temp_index(current_ssa_temp_index_++);
+          bind->set_ssa_temp_index(alloc_ssa_temp_index());
           env->Add(new UseVal(bind));
         }
       }
     }
   }
 
   // 3. Process dominated blocks.
   for (intptr_t i = 0; i < block_entry->dominated_blocks().length(); ++i) {
     BlockEntryInstr* block = block_entry->dominated_blocks()[i];
     ZoneGrowableArray<Value*>* new_env =
@@ skipping 32 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart