Merge bleeding edge up to 9192 into the GC branch.

src/scanner-base.h

Index: src/scanner-base.h
diff --git a/src/scanner-base.h b/src/scanner-base.h
index a7062a34afcf3a540b6baac54abfbbad647c6bf3..2e223ce6001a475975f3ba6155bf8d8079b21147 100644
--- a/src/scanner-base.h
+++ b/src/scanner-base.h
@@ -349,6 +349,8 @@ class Scanner {
     return next_.literal_chars->length();
   }
 
+  UnicodeCache* unicode_cache() { return unicode_cache_; }
+
   static const int kCharacterLookaheadBufferSize = 1;
 
  protected:
@@ -362,7 +364,7 @@ class Scanner {
   // Call this after setting source_ to the input.
   void Init() {
     // Set c0_ (one character ahead)
-    ASSERT(kCharacterLookaheadBufferSize == 1);
+    STATIC_ASSERT(kCharacterLookaheadBufferSize == 1);
     Advance();
     // Initialize current_ to not refer to a literal.
     current_.literal_chars = NULL;