Revert revision 331. The propagation of monomorphic prototype failure...

src/ic.h

Index: src/ic.h
===================================================================
--- src/ic.h	(revision 331)
+++ src/ic.h	(working copy)
@@ -81,12 +81,8 @@
   Code* target() { return GetTargetAtAddress(address()); }
   inline Address address();
 
-  // Compute the state of the current inline cache.  If the current
-  // inline cache is monomorphic, this might change the code cache in
-  // the receiver map and it might return a code object from the code
-  // cache in the receiver map that should be used as the new target.
-  static State ComputeCacheState(Code* target, Object* receiver,
-                                 Object* name, Object** new_target);
+  // Compute the current IC state based on the target stub and the receiver.
+  static State StateFrom(Code* target, Object* receiver);
 
   // Clear the inline cache to initial state.
   static void Clear(Address address);
@@ -165,7 +161,7 @@
  public:
   CallIC() : IC(EXTRA_CALL_FRAME) { ASSERT(target()->is_call_stub()); }
 
-  Object* LoadFunction(Handle<Object> object, Handle<String> name);
+  Object* LoadFunction(State state, Handle<Object> object, Handle<String> name);
 
 
   // Code generator routines.
@@ -183,6 +179,7 @@
   // Update the inline cache and the global stub cache based on the
   // lookup result.
   void UpdateCaches(LookupResult* lookup,
+                    State state,
                     Handle<Object> object,
                     Handle<String> name);
 
@@ -200,7 +197,7 @@
  public:
   LoadIC() : IC(NO_EXTRA_FRAME) { ASSERT(target()->is_load_stub()); }
 
-  Object* Load(Handle<Object> object, Handle<String> name);
+  Object* Load(State state, Handle<Object> object, Handle<String> name);
 
   // Code generator routines.
   static void GenerateInitialize(MacroAssembler* masm);
@@ -222,6 +219,7 @@
   // Update the inline cache and the global stub cache based on the
   // lookup result.
   void UpdateCaches(LookupResult* lookup,
+                    State state,
                     Handle<Object> object,
                     Handle<String> name);
 
@@ -245,7 +243,7 @@
  public:
   KeyedLoadIC() : IC(NO_EXTRA_FRAME) { ASSERT(target()->is_keyed_load_stub()); }
 
-  Object* Load(Handle<Object> object, Handle<Object> key);
+  Object* Load(State state, Handle<Object> object, Handle<Object> key);
 
   // Code generator routines.
   static void GenerateMiss(MacroAssembler* masm);
@@ -258,6 +256,7 @@
 
   // Update the inline cache.
   void UpdateCaches(LookupResult* lookup,
+                    State state,
                     Handle<Object> object,
                     Handle<String> name);
 
@@ -284,7 +283,8 @@
  public:
   StoreIC() : IC(NO_EXTRA_FRAME) { ASSERT(target()->is_store_stub()); }
 
-  Object* Store(Handle<Object> object,
+  Object* Store(State state,
+                Handle<Object> object,
                 Handle<String> name,
                 Handle<Object> value);
 
@@ -299,7 +299,7 @@
   // Update the inline cache and the global stub cache based on the
   // lookup result.
   void UpdateCaches(LookupResult* lookup,
-                    Handle<JSObject> receiver,
+                    State state, Handle<JSObject> receiver,
                     Handle<String> name,
                     Handle<Object> value);
 
@@ -320,7 +320,8 @@
  public:
   KeyedStoreIC() : IC(NO_EXTRA_FRAME) { }
 
-  Object* Store(Handle<Object> object,
+  Object* Store(State state,
+                Handle<Object> object,
                 Handle<Object> name,
                 Handle<Object> value);
 
@@ -334,6 +335,7 @@
 
   // Update the inline cache.
   void UpdateCaches(LookupResult* lookup,
+                    State state,
                     Handle<JSObject> receiver,
                     Handle<String> name,
                     Handle<Object> value);