Introduce concurrent on-stack replacement.

src/compiler.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 478 matching lines @@
 class LChunk;
 
 // A helper class that calls the three compilation phases in
 // Crankshaft and keeps track of its state.  The three phases
 // CreateGraph, OptimizeGraph and GenerateAndInstallCode can either
 // fail, bail-out to the full code generator or succeed.  Apart from
 // their return value, the status of the phase last run can be checked
 // using last_status().
 class OptimizingCompiler: public ZoneObject {
  public:
-  explicit OptimizingCompiler(CompilationInfo* info)
+  explicit OptimizingCompiler(CompilationInfo* info,
+                              uint32_t osr_pc_offset = 0)
       : info_(info),
         graph_builder_(NULL),
         graph_(NULL),
         chunk_(NULL),
+        osr_pc_offset_(osr_pc_offset),

[titzer, 2013/09/02 17:03:35]

This is the PC offset of the backedge. It seems weird that it's going be part of
the compiler. Seems like it would fit better in the CompilationInfo.

[Yang, 2013/09/03 08:50:10]

Done.

         last_status_(FAILED) { }
 
   enum Status {
     FAILED, BAILED_OUT, SUCCEEDED
   };
 
   MUST_USE_RESULT Status CreateGraph();
   MUST_USE_RESULT Status OptimizeGraph();
   MUST_USE_RESULT Status GenerateAndInstallCode();
 
   Status last_status() const { return last_status_; }
   CompilationInfo* info() const { return info_; }
   Isolate* isolate() const { return info()->isolate(); }
+  uint32_t osr_pc_offset() { return osr_pc_offset_; }
 
   MUST_USE_RESULT Status AbortOptimization() {
     info_->AbortOptimization();
     info_->shared_info()->DisableOptimization(info_->bailout_reason());
     return SetLastStatus(BAILED_OUT);
   }
 
  private:
   CompilationInfo* info_;
   HOptimizedGraphBuilder* graph_builder_;
   HGraph* graph_;
   LChunk* chunk_;
   TimeDelta time_taken_to_create_graph_;
   TimeDelta time_taken_to_optimize_;
   TimeDelta time_taken_to_codegen_;
+  uint32_t osr_pc_offset_;
   Status last_status_;
 
   MUST_USE_RESULT Status SetLastStatus(Status status) {
     last_status_ = status;
     return last_status_;
   }
   void RecordOptimizationStats();
 
   struct Timer {
     Timer(OptimizingCompiler* compiler, TimeDelta* location)
@@ skipping 51 matching lines @@
                                                 Handle<Context> context,
                                                 bool is_global,
                                                 LanguageMode language_mode,
                                                 ParseRestriction restriction,
                                                 int scope_position);
 
   // Compile from function info (used for lazy compilation). Returns true on
   // success and false if the compilation resulted in a stack overflow.
   static bool CompileLazy(CompilationInfo* info);
 
-  static void RecompileConcurrent(Handle<JSFunction> function);
+  static void RecompileConcurrent(Handle<JSFunction> function,
+                                  uint32_t osr_pc_offset = 0);
 
   // Compile a shared function info object (the function is possibly lazily
   // compiled).
   static Handle<SharedFunctionInfo> BuildFunctionInfo(FunctionLiteral* node,
                                                       Handle<Script> script);
 
   // Set the function info for a newly compiled function.
   static void SetFunctionInfo(Handle<SharedFunctionInfo> function_info,
                               FunctionLiteral* lit,
                               bool is_toplevel,
                               Handle<Script> script);
 
   static void InstallOptimizedCode(OptimizingCompiler* info);
 
+  static bool CompileForOnStackReplacement(Handle<JSFunction> function,
+                                           BailoutId* ast_id_out);
+
+  static bool CompileForConcurrentOSR(Handle<JSFunction> function,
+                                      BailoutId* ast_id_out);
+
 #ifdef ENABLE_DEBUGGER_SUPPORT
   static bool MakeCodeForLiveEdit(CompilationInfo* info);
 #endif
 
   static void RecordFunctionCompilation(Logger::LogEventsAndTags tag,
                                         CompilationInfo* info,
                                         Handle<SharedFunctionInfo> shared);
 };
 
 
@@ skipping 17 matching lines @@
   unsigned info_zone_start_allocation_size_;
   ElapsedTimer timer_;
 
   DISALLOW_COPY_AND_ASSIGN(CompilationPhase);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_COMPILER_H_