Move responsibility for definition of ExtraICState bits into the ICs.

src/stub-cache.h

Index: src/stub-cache.h
diff --git a/src/stub-cache.h b/src/stub-cache.h
index 199fca5fe9226198076c1be283dc94f18b810349..c3da6385bfae3e6bc8dc24d45620d2c9c9d10061 100644
--- a/src/stub-cache.h
+++ b/src/stub-cache.h
@@ -83,7 +83,7 @@ class StubCache {
   Handle<Code> FindIC(Handle<Name> name,
                       Handle<Map> stub_holder_map,
                       Code::Kind kind,
-                      Code::ExtraICState extra_state = Code::kNoExtraICState,
+                      Code::ExtraICState extra_state = IC::kNoExtraICState,
                       InlineCacheHolderFlag cache_holder = OWN_MAP);
 
   Handle<Code> FindHandler(Handle<Name> name,
@@ -95,7 +95,7 @@ class StubCache {
   Handle<Code> ComputeMonomorphicIC(Handle<Name> name,
                                     Handle<Type> type,
                                     Handle<Code> handler,
-                                    StrictModeFlag strict_mode);
+                                    Code::ExtraICState extra_ic_state);
 
   Handle<Code> ComputeLoadNonexistent(Handle<Name> name, Handle<Type> type);
 
@@ -590,7 +590,7 @@ class BaseLoadStoreStubCompiler: public StubCompiler {
   }
   void JitEvent(Handle<Name> name, Handle<Code> code);
 
-  virtual Code::ExtraICState extra_state() { return Code::kNoExtraICState; }
+  virtual Code::ExtraICState extra_state() { return IC::kNoExtraICState; }
   virtual Register receiver() = 0;
   virtual Register name() = 0;
   virtual Register scratch1() = 0;
@@ -828,7 +828,9 @@ class StoreStubCompiler: public BaseLoadStoreStubCompiler {
   virtual Register scratch2() { return registers_[4]; }
   virtual Register scratch3() { return registers_[5]; }
   StrictModeFlag strict_mode() { return strict_mode_; }
-  virtual Code::ExtraICState extra_state() { return strict_mode_; }
+  virtual Code::ExtraICState extra_state() {
+    return StoreIC::ComputeExtraICState(strict_mode_);
+  }
 
  protected:
   static Register* registers();
@@ -859,7 +861,7 @@ class KeyedStoreStubCompiler: public StoreStubCompiler {
 
  protected:
   virtual Code::ExtraICState extra_state() {
-    return Code::ComputeExtraICState(store_mode_, strict_mode());
+    return KeyedStoreIC::ComputeExtraICState(strict_mode(), store_mode_);
   }
   static Register* registers();