VM: Separate precompilation-specific code, make flags const.

runtime/vm/flow_graph_inliner.cc

 // Copyright (c) 2013, 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_inliner.h"
 
+#include "vm/aot_optimizer.h"
 #include "vm/block_scheduler.h"
 #include "vm/branch_optimizer.h"
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
 #include "vm/flow_graph_optimizer.h"
 #include "vm/flow_graph_type_propagator.h"
 #include "vm/il_printer.h"
@@ skipping 766 matching lines @@
           // Compute SSA on the callee graph, catching bailouts.
           callee_graph->ComputeSSA(caller_graph_->max_virtual_register_number(),
                                    param_stubs);
           DEBUG_ASSERT(callee_graph->VerifyUseLists());
         }
 
         {
           CSTAT_TIMER_SCOPE(thread(), graphinliner_opt_timer);
           // TODO(fschneider): Improve suppression of speculative inlining.
           // Deopt-ids overlap between caller and callee.
-          FlowGraphOptimizer optimizer(callee_graph,
-                                       inliner_->use_speculative_inlining_,
-                                       inliner_->inlining_black_list_);
           if (FLAG_precompilation) {
+            AotOptimizer optimizer(callee_graph,
+                                   inliner_->use_speculative_inlining_,
+                                   inliner_->inlining_black_list_);
             optimizer.PopulateWithICData();
 
             optimizer.ApplyClassIds();
             DEBUG_ASSERT(callee_graph->VerifyUseLists());
 
             FlowGraphTypePropagator::Propagate(callee_graph);
             DEBUG_ASSERT(callee_graph->VerifyUseLists());
+
+            optimizer.ApplyICData();
+            DEBUG_ASSERT(callee_graph->VerifyUseLists());
+
+            // Optimize (a << b) & c patterns, merge instructions. Must occur
+            // before 'SelectRepresentations' which inserts conversion nodes.
+            optimizer.TryOptimizePatterns();
+            DEBUG_ASSERT(callee_graph->VerifyUseLists());
+          } else {
+            FlowGraphOptimizer optimizer(callee_graph,

[rmacnak, 2016/02/19 00:54:32]

Maybe this should be JitOptimizer for clarity.

[Florian Schneider, 2016/02/19 17:42:29]

Ack. Will do this in a separate CL to not blow this one up by too much renaming.

+                                         inliner_->use_speculative_inlining_,
+                                         inliner_->inlining_black_list_);
+            optimizer.ApplyICData();
+            DEBUG_ASSERT(callee_graph->VerifyUseLists());
+
+            // Optimize (a << b) & c patterns, merge instructions. Must occur
+            // before 'SelectRepresentations' which inserts conversion nodes.
+            optimizer.TryOptimizePatterns();
+            DEBUG_ASSERT(callee_graph->VerifyUseLists());
           }
-          optimizer.ApplyICData();
-          DEBUG_ASSERT(callee_graph->VerifyUseLists());
-
-          // Optimize (a << b) & c patterns, merge instructions. Must occur
-          // before 'SelectRepresentations' which inserts conversion nodes.
-          optimizer.TryOptimizePatterns();
-          DEBUG_ASSERT(callee_graph->VerifyUseLists());
         }
 
         if (FLAG_support_il_printer && FLAG_trace_inlining &&
             (FLAG_print_flow_graph || FLAG_print_flow_graph_optimized)) {
           THR_Print("Callee graph for inlining %s\n",
                     function.ToFullyQualifiedCString());
           FlowGraphPrinter printer(*callee_graph);
           printer.PrintBlocks();
         }
 
@@ skipping 679 matching lines @@
     Value* input = second->InputAt(i);
     input->definition()->AddInputUse(input);
   }
   first->LinkTo(second);
   return second;
 }
 
 
 bool PolymorphicInliner::TryInlineRecognizedMethod(intptr_t receiver_cid,
                                                    const Function& target) {
-  FlowGraphOptimizer optimizer(owner_->caller_graph(),
-                               false,  // Speculative inlining not applicable.
-                               NULL);
   TargetEntryInstr* entry;
   Definition* last;
   // Replace the receiver argument with a redefinition to prevent code from
   // the inlined body from being hoisted above the inlined entry.
   GrowableArray<Definition*> arguments(call_->ArgumentCount());
   Definition* receiver = call_->ArgumentAt(0);
     RedefinitionInstr* redefinition =
         new(Z) RedefinitionInstr(new(Z) Value(receiver));
     redefinition->set_ssa_temp_index(
         owner_->caller_graph()->alloc_ssa_temp_index());
@@ skipping 1524 matching lines @@
       return InlineDoubleOp(flow_graph, Token::kMUL, call, entry, last);
     case MethodRecognizer::kDoubleDiv:
       return InlineDoubleOp(flow_graph, Token::kDIV, call, entry, last);
     default:
       return false;
   }
 }
 
 
 }  // namespace dart