Merge r3643 and r3659 from bleeding_edge to trunk to...

src/ic.h

Index: src/ic.h
===================================================================
--- src/ic.h	(revision 3684)
+++ src/ic.h	(working copy)
@@ -293,6 +293,13 @@
   static void ClearInlinedVersion(Address address);
 
  private:
+  // Bit mask to be tested against bit field for the cases when
+  // generic stub should go into slow case.
+  // Access check is necessary explicitly since generic stub does not perform
+  // map checks.
+  static const int kSlowCaseBitFieldMask =
+      (1 << Map::kIsAccessCheckNeeded) | (1 << Map::kHasIndexedInterceptor);
+
   static void Generate(MacroAssembler* masm, const ExternalReference& f);
 
   // Update the inline cache.