First step toward an optimizing compiler:

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/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/disassembler.h"
 #include "vm/exceptions.h"
 #include "vm/flags.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
+#include "vm/flow_graph_optimizer.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/opt_code_generator.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 #include "vm/scanner.h"
 #include "vm/timer.h"
 
 namespace dart {
@@ skipping 58 matching lines @@
 // Returns an array indexed by computation id, containing the extracted ICData.
 static RawArray* ExtractTypeFeedbackArray(const Code& code) {
   ASSERT(!code.IsNull() && !code.is_optimized());
   GrowableArray<intptr_t> computation_ids;
   const GrowableObjectArray& ic_data_objs =
       GrowableObjectArray::Handle(GrowableObjectArray::New());
   const intptr_t max_id =
       code.ExtractIcDataArraysAtCalls(&computation_ids, ic_data_objs);
   const Array& result = Array::Handle(Array::New(max_id + 1));
   for (intptr_t i = 0; i < computation_ids.length(); i++) {
-    ASSERT(result.At(i) == Object::null());
-    result.SetAt(i, Object::Handle(ic_data_objs.At(i)));
+    intptr_t result_index = computation_ids[i];
+    ASSERT(result.At(result_index) == Object::null());
+    result.SetAt(result_index, Object::Handle(ic_data_objs.At(i)));
   }
   return result.raw();
 }
 
 
 RawError* Compiler::Compile(const Library& library, const Script& script) {
   Isolate* isolate = Isolate::Current();
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
@@ skipping 38 matching lines @@
               Code::Handle(function.unoptimized_code()).EntryPoint());
   }
 }
 
 
 // Return false if bailed out.
 static bool CompileWithNewCompiler(
     const ParsedFunction& parsed_function, bool optimized) {
   bool is_compiled = false;
   Isolate* isolate = Isolate::Current();
+  const intptr_t prev_cid = isolate->computation_id();
+  isolate->set_computation_id(0);
   LongJump* old_base = isolate->long_jump_base();
   LongJump bailout_jump;
   isolate->set_long_jump_base(&bailout_jump);
   if (setjmp(*bailout_jump.Set()) == 0) {
     GrowableArray<BlockEntryInstr*> block_order;
     // TimerScope needs an isolate to be properly terminated in case of a
     // LongJump.
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::graphbuilder_timer,
@@ skipping 18 matching lines @@
       FlowGraphBuilder graph_builder(parsed_function);
       graph_builder.BuildGraph(optimized);
 
       // The non-optimizing compiler compiles blocks in reverse postorder,
       // because it is a 'natural' order for the human reader of the
       // generated code.
       intptr_t length = graph_builder.postorder_block_entries().length();
       for (intptr_t i = length - 1; i >= 0; --i) {
         block_order.Add(graph_builder.postorder_block_entries()[i]);
       }
+      if (optimized) {
+        FlowGraphOptimizer optimizer(block_order);
+        optimizer.ApplyICData();
+      }
     }
 
     Assembler assembler;
     FlowGraphCompiler graph_compiler(&assembler, parsed_function,
                                      block_order, optimized);
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::graphcompiler_timer,
                        isolate);
       graph_compiler.CompileGraph();
@@ skipping 29 matching lines @@
     // We bailed out.
     Error& bailout_error = Error::Handle(
         isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     if (FLAG_trace_bailout) {
       OS::Print("%s\n", bailout_error.ToErrorCString());
     }
     is_compiled = false;
   }
   isolate->set_long_jump_base(old_base);
+  isolate->set_computation_id(prev_cid);
   return is_compiled;
 }
 
 
 static void CompileWithOldCompiler(
     const ParsedFunction& parsed_function, bool optimized) {
   const Function& function = parsed_function.function();
   Assembler assembler;
   if (optimized) {
     // Transition to optimized code only from unoptimized code ...
@@ skipping 285 matching lines @@
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 
 }  // namespace dart