Make ICData changes thread safe (first compute array, then set it). Install code in the main thread…

runtime/vm/intrinsifier.cc

Index: runtime/vm/intrinsifier.cc
diff --git a/runtime/vm/intrinsifier.cc b/runtime/vm/intrinsifier.cc
index 83681cd7662f4029f932509763987da78dcc85a2..aa5ba86cb22dc5cfe93aa6166d5421b0cba1e485 100644
--- a/runtime/vm/intrinsifier.cc
+++ b/runtime/vm/intrinsifier.cc
@@ -4,18 +4,19 @@
 // Class for intrinsifying functions.
 
 #include "vm/assembler.h"
-#include "vm/intrinsifier.h"
+#include "vm/compiler.h"
 #include "vm/flags.h"
-#include "vm/object.h"
-#include "vm/symbols.h"
-
 #include "vm/flow_graph.h"
 #include "vm/flow_graph_compiler.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/il_printer.h"
 #include "vm/intermediate_language.h"
+#include "vm/intrinsifier.h"
+#include "vm/object.h"
 #include "vm/parser.h"
+#include "vm/symbols.h"
+
 
 namespace dart {
 
@@ -133,14 +134,14 @@ bool Intrinsifier::GraphIntrinsify(const ParsedFunction& parsed_function,
   FlowGraphBuilder builder(parsed_function,
                            *ic_data_array,
                            NULL,  // NULL = not inlining.
-                           Thread::kNoDeoptId);  // No OSR id.
+                           Compiler::kNoOSRDeoptId);
 
   intptr_t block_id = builder.AllocateBlockId();
   TargetEntryInstr* normal_entry =
       new TargetEntryInstr(block_id,
                            CatchClauseNode::kInvalidTryIndex);
   GraphEntryInstr* graph_entry = new GraphEntryInstr(
-      parsed_function, normal_entry, Thread::kNoDeoptId);  // No OSR id.
+      parsed_function, normal_entry, Compiler::kNoOSRDeoptId);
   FlowGraph* graph = new FlowGraph(parsed_function, graph_entry, block_id);
   const Function& function = parsed_function.function();
   switch (function.recognized_kind()) {