Merge bleeding_edge@1955 to 1.1 branch to improve compilation...

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 22 matching lines @@
 
 // The compilation cache keeps function boilerplates for compiled
 // scripts and evals. The boilerplates are looked up using the source
 // string as the key.
 class CompilationCache {
  public:
   // The same source code string has different compiled code for
   // scripts and evals. Internally, we use separate caches to avoid
   // getting the wrong kind of entry when looking up.
   enum Entry {
-    SCRIPT,
     EVAL_GLOBAL,
     EVAL_CONTEXTUAL,
     REGEXP,
-    LAST_ENTRY = REGEXP
+    SCRIPT,
+    LAST_ENTRY = SCRIPT
   };
 
   // Finds the script function boilerplate for a source
   // string. Returns an empty handle if the cache doesn't contain a
   // script for the given source string with the right origin.
   static Handle<JSFunction> LookupScript(Handle<String> source,
                                          Handle<Object> name,
                                          int line_offset,
                                          int column_offset);
 
@@ skipping 28 matching lines @@
                         Handle<FixedArray> data);
 
   // Clear the cache - also used to initialize the cache at startup.
   static void Clear();
 
   // GC support.
   static void Iterate(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. For now, we
-  // just clear the cache but we should consider are more
-  // sophisticated LRU scheme.
-  static void MarkCompactPrologue() { Clear(); }
+  // avoid keeping them alive too long without using them.
+  static void MarkCompactPrologue();
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_COMPILATION_CACHE_H_