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

runtime/vm/compiler.h

 // 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.
 
 #ifndef VM_COMPILER_H_
 #define VM_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 #include "vm/runtime_entry.h"
 #include "vm/thread_pool.h"
 
 namespace dart {
 
 // Forward declarations.
 class Class;
+class Code;
 class Function;
 class Library;
 class ParsedFunction;
 class RawInstance;
 class Script;
 class SequenceNode;
 
 class Compiler : public AllStatic {
  public:
+  static const intptr_t kNoOSRDeoptId = Thread::kNoDeoptId;
+
   // Extracts top level entities from the script and populates
   // the class dictionary of the library.
   //
   // Returns Error::null() if there is no compilation error.
   static RawError* Compile(const Library& library, const Script& script);
 
   // Extracts function and field symbols from the class and populates
   // the class.
   //
   // Returns Error::null() if there is no compilation error.
   static RawError* CompileClass(const Class& cls);
 
   // Generates code for given function and sets its code field.
   //
   // Returns Error::null() if there is no compilation error.
   static RawError* CompileFunction(Thread* thread, const Function& function);
 
   // Generates unoptimized code if not present, current code is unchanged.
   static RawError* EnsureUnoptimizedCode(Thread* thread,
                                          const Function& function);
 
   // Generates optimized code for function.
   //
   // Returns Error::null() if there is no compilation error.
+  // If 'result_code' is not NULL, then the generated code is returned but
+  // not installed.
   static RawError* CompileOptimizedFunction(
       Thread* thread,
       const Function& function,
-      intptr_t osr_id = Thread::kNoDeoptId);
+      intptr_t osr_id = kNoOSRDeoptId,
+      Code* result_code = NULL);
 
   // Generates code for given parsed function (without parsing it again) and
   // sets its code field.
   //
   // Returns Error::null() if there is no compilation error.
   static RawError* CompileParsedFunction(ParsedFunction* parsed_function);
 
   // Generates and executes code for a given code fragment, e.g. a
   // compile time constant expression. Returns the result returned
   // by the fragment.
@@ skipping 33 matching lines @@
 
  private:
   static bool always_optimize_;
   static bool allow_recompilation_;
 };
 
 
 // Class to run optimizing compilation in a background thread.
 // Current implementation: one task per isolate, it dies with the owning
 // isolate.
+// No OSR compilation in the background compiler.
 class BackgroundCompiler : public ThreadPool::Task {
  public:
   static void EnsureInit(Thread* thread);
 
   static void Stop(BackgroundCompiler* task);
 
+  // Call to optimize a function in the background, enters the function in the
+  // compilation queue.
   void CompileOptimized(const Function& function);
 
+  // Call to activate/install optimized code (must occur in the mutator thread).
+  void InstallGeneratedCode();
+
   // Access to queue length is guarded with queue_monitor_;
-  intptr_t queue_length() const { return queue_length_; }
-  void set_queue_length(intptr_t value) { queue_length_ = value; }
+  intptr_t function_queue_length() const { return function_queue_length_; }
+  void set_function_queue_length(intptr_t value) {
+    function_queue_length_ = value;
+  }
 
  private:
   explicit BackgroundCompiler(Isolate* isolate);
 
+  GrowableObjectArray* FunctionsQueue() const;
+  GrowableObjectArray* CodesQueue() const;
+
   virtual void Run();
 
-  void Add(const Function& f);
-  RawFunction* RemoveOrNull();
-  RawFunction* LastOrNull() const;
+  void AddFunction(const Function& f);
+  RawFunction* RemoveFunctionOrNull();
+  RawFunction* LastFunctionOrNull() const;
+
+  void AddCode(const Code& c);
 
   Isolate* isolate_;
   bool running_;       // While true, will try to read queue and compile.
   bool* done_;         // True if the thread is done.
   Monitor* queue_monitor_;  // Controls access to the queue.
   Monitor* done_monitor_;   // Notify/wait that the thread is done.
 
-  intptr_t queue_length_;  // Lightweight access to length of compiler queue.
+  // Lightweight access to length of compiler queue.
+  intptr_t function_queue_length_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(BackgroundCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_COMPILER_H_