Merge bleeding edge up to 9192 into the GC branch.

src/stub-cache.h

Index: src/stub-cache.h
diff --git a/src/stub-cache.h b/src/stub-cache.h
index a97a4cdab2a880d4158df59fc67095a194c630c6..dd06a1c078d711f32bbfb646b698b137d4f79511 100644
--- a/src/stub-cache.h
+++ b/src/stub-cache.h
@@ -357,7 +357,7 @@ class StubCache {
     // shift are equal.  Shifting down the length field to get the
     // hash code would effectively throw away two bits of the hash
     // code.
-    ASSERT(kHeapObjectTagSize == String::kHashShift);
+    STATIC_ASSERT(kHeapObjectTagSize == String::kHashShift);
     // Compute the hash of the name (use entire hash field).
     ASSERT(name->HasHashCode());
     uint32_t field = name->hash_field();