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

src/compilation-cache.h

Index: src/compilation-cache.h
===================================================================
--- src/compilation-cache.h	(revision 1984)
+++ src/compilation-cache.h	(working copy)
@@ -40,11 +40,11 @@
   // 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
@@ -93,10 +93,8 @@
 
   // 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();
 };