[Isolates] Merge crankshaft (r5922 from bleeding_edge).

src/compilation-cache.h

 // Copyright 2008 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 13 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef V8_COMPILATION_CACHE_H_
 #define V8_COMPILATION_CACHE_H_
 
 namespace v8 {
 namespace internal {
 
+class HashMap;
 
 // The compilation cache consists of several generational sub-caches which uses
 // this class as a base class. A sub-cache contains a compilation cache tables
 // for each generation of the sub-cache. Since the same source code string has
 // different compiled code for scripts and evals, we use separate sub-caches
 // for different compilation modes, to avoid retrieving the wrong result.
 class CompilationSubCache {
  public:
   explicit CompilationSubCache(int generations): generations_(generations) {
     tables_ = NewArray<Object*>(generations);
@@ skipping 20 matching lines @@
   // young generation.
   void Age();
 
   // GC support.
   void Iterate(ObjectVisitor* v);
   void IterateFunctions(ObjectVisitor* v);
 
   // Clear this sub-cache evicting all its content.
   void Clear();
 
+  // Remove given shared function info from sub-cache.
+  void Remove(Handle<SharedFunctionInfo> function_info);
+
   // Number of generations in this sub-cache.
   inline int generations() { return generations_; }
 
  private:
   int generations_;  // Number of generations.
   Object** tables_;  // Compilation cache tables - one for each generation.
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(CompilationSubCache);
 };
 
@@ skipping 120 matching lines @@
                Handle<Context> context,
                bool is_global,
                Handle<SharedFunctionInfo> function_info);
 
   // Associate the (source, flags) pair to the given regexp data.
   // This may overwrite an existing mapping.
   void PutRegExp(Handle<String> source,
                  JSRegExp::Flags flags,
                  Handle<FixedArray> data);
 
+  // Support for eager optimization tracking.
+  bool ShouldOptimizeEagerly(Handle<JSFunction> function);
+  void MarkForEagerOptimizing(Handle<JSFunction> function);
+  void MarkForLazyOptimizing(Handle<JSFunction> function);
+
+  // Reset the eager optimization tracking data.
+  void ResetEagerOptimizingData();
+
   // Clear the cache - also used to initialize the cache at startup.
   void Clear();
 
+  // Remove given shared function info from all caches.
+  void Remove(Handle<SharedFunctionInfo> function_info);
+
   // GC support.
   void Iterate(ObjectVisitor* v);
   void IterateFunctions(ObjectVisitor* v);
 
   // Notify the cache that a mark-sweep garbage collection is about to
   // take place. This is used to retire entries from the cache to
   // avoid keeping them alive too long without using them.
   void MarkCompactPrologue();
 
   // Enable/disable compilation cache. Used by debugger to disable compilation
   // cache during debugging to make sure new scripts are always compiled.
   void Enable();
   void Disable();
  private:
   CompilationCache();
+  ~CompilationCache();
+
+  HashMap* EagerOptimizingSet();
 
   // The number of sub caches covering the different types to cache.
   static const int kSubCacheCount = 4;
 
   CompilationCacheScript script_;
   CompilationCacheEval eval_global_;
   CompilationCacheEval eval_contextual_;
   CompilationCacheRegExp reg_exp_;
   CompilationSubCache* subcaches_[kSubCacheCount];
 
   // Current enable state of the compilation cache.
   bool enabled_;
 
+  HashMap* eager_optimizing_set_;
+
   bool IsEnabled() { return FLAG_compilation_cache && enabled_; }
 
   friend class Isolate;
 
   DISALLOW_COPY_AND_ASSIGN(CompilationCache);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_COMPILATION_CACHE_H_