Fix IC data insertion: do it before the graph is built.

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"
@@ skipping 146 matching lines @@
   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,
                        isolate);
-      CompilerStats::graphbuilder_timer.Start();
-      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) {
         // Transition to optimized code only from unoptimized code ...
         // for now.
         ASSERT(parsed_function.function().HasCode());
         ASSERT(!parsed_function.function().HasOptimizedCode());
+        // Extract type feedback before the graph is built, as the graph
+        // builder uses it to attach it to nodes.
         // Do not use type feedback to optimize a function that was
         // deoptimized too often.
         if (parsed_function.function().deoptimization_counter() <
             FLAG_deoptimization_counter_threshold) {
           const Code& unoptimized_code =
               Code::Handle(parsed_function.function().unoptimized_code());
           isolate->set_ic_data_array(
               ExtractTypeFeedbackArray(unoptimized_code));
         }
       }
+      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]);
+      }
     }
 
     Assembler assembler;
     FlowGraphCompiler graph_compiler(&assembler, parsed_function,
                                      block_order, optimized);
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::graphcompiler_timer,
                        isolate);
       graph_compiler.CompileGraph();
@@ skipping 329 matching lines @@
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 
 }  // namespace dart