Cleanups.

runtime/vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/block_scheduler.h"
@@ skipping 120 matching lines @@
 
     // Allocate variables now that we know the number of locals.
     parsed_function->AllocateIrregexpVariables(result.num_stack_locals);
 
     // Build the flow graph.
     FlowGraphBuilder builder(parsed_function,
                              ic_data_array,
                              NULL,  // NULL = not inlining.
                              osr_id);
 
-    return new(isolate_) FlowGraph(builder,
+    return new(isolate_) FlowGraph(parsed_function,
                                    result.graph_entry,
                                    result.num_blocks);
   }
 
   virtual void FinalizeCompilation() {
     backtrack_goto_->ComputeOffsetTable(isolate_);
   }
 
  private:
   IndirectGotoInstr* backtrack_goto_;
@@ skipping 266 matching lines @@
               }
             }
           }
         }
 
         flow_graph = pipeline->BuildFlowGraph(parsed_function,
                                               *ic_data_array,
                                               osr_id);
       }
 
-      if (FLAG_print_flow_graph ||
-          (optimized && FLAG_print_flow_graph_optimized)) {
+      const bool print_flow_graph =
+          FLAG_print_flow_graph ||
+          (optimized && FLAG_print_flow_graph_optimized);
+
+      if (print_flow_graph) {
         if (osr_id == Isolate::kNoDeoptId) {
           FlowGraphPrinter::PrintGraph("Before Optimizations", flow_graph);
         } else {
           FlowGraphPrinter::PrintGraph("For OSR", flow_graph);
         }
       }
 
       BlockScheduler block_scheduler(flow_graph);
       const bool reorder_blocks =
           FlowGraph::ShouldReorderBlocks(function, optimized);
       if (reorder_blocks) {
         block_scheduler.AssignEdgeWeights();
       }
 
       if (optimized) {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::ssa_timer,
                          isolate);
         // Transform to SSA (virtual register 0 and no inlining arguments).
         flow_graph->ComputeSSA(0, NULL);
         DEBUG_ASSERT(flow_graph->VerifyUseLists());
-        if (FLAG_print_flow_graph || FLAG_print_flow_graph_optimized) {
+        if (print_flow_graph) {
           FlowGraphPrinter::PrintGraph("After SSA", flow_graph);
         }
       }
 
       // Collect all instance fields that are loaded in the graph and
       // have non-generic type feedback attached to them that can
       // potentially affect optimizations.
       if (optimized) {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphoptimizer_timer,
@@ skipping 198 matching lines @@
 
         // Compute and store graph informations (call & instruction counts)
         // to be later used by the inliner.
         FlowGraphInliner::CollectGraphInfo(flow_graph, true);
 
         // Perform register allocation on the SSA graph.
         FlowGraphAllocator allocator(*flow_graph);
         allocator.AllocateRegisters();
         if (reorder_blocks) block_scheduler.ReorderBlocks();
 
-        if (FLAG_print_flow_graph || FLAG_print_flow_graph_optimized) {
+        if (print_flow_graph) {
           FlowGraphPrinter::PrintGraph("After Optimizations", flow_graph);
         }
       }
 
       Assembler assembler(use_far_branches);
       FlowGraphCompiler graph_compiler(&assembler, flow_graph, optimized);
       {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphcompiler_timer,
                          isolate);
@@ skipping 494 matching lines @@
     const Object& result =
       PassiveObject::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart