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

src/ic.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 63 matching lines @@
   };
 
   // Construct the IC structure with the given number of extra
   // JavaScript frames on the stack.
   explicit IC(FrameDepth depth);
 
   // Get the call-site target; used for determining the state.
   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);
 
   // Computes the reloc info for this IC. This is a fairly expensive
   // operation as it has to search through the heap to find the code
   // object that contains this IC site.
   RelocMode ComputeMode();
 
   // Returns if this IC is for contextual (no explicit receiver)
@@ skipping 58 matching lines @@
  private:
   Address address_;
   IC::UtilityId id_;
 };
 
 
 class CallIC: public IC {
  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.
   static void GenerateInitialize(MacroAssembler* masm, int argc);
   static void GeneratePreMonomorphic(MacroAssembler* masm, int argc);
   static void GenerateMiss(MacroAssembler* masm, int argc);
   static void GenerateMegamorphic(MacroAssembler* masm, int argc);
   static void GenerateNormal(MacroAssembler* masm, int argc);
 
  private:
   static void Generate(MacroAssembler* masm,
                        int argc,
                        const ExternalReference& f);
 
   // 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);
 
   // Returns a JSFunction if the object can be called as a function,
   // and patches the stack to be ready for the call.
   // Otherwise, it returns the undefined value.
   Object* TryCallAsFunction(Object* object);
 
   static void Clear(Address address, Code* target);
   friend class IC;
 };
 
 
 class LoadIC: public IC {
  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);
   static void GeneratePreMonomorphic(MacroAssembler* masm);
   static void GenerateMiss(MacroAssembler* masm);
   static void GenerateMegamorphic(MacroAssembler* masm);
   static void GenerateNormal(MacroAssembler* masm);
 
   // Specialized code generator routines.
   static void GenerateArrayLength(MacroAssembler* masm);
   static void GenerateShortStringLength(MacroAssembler* masm);
   static void GenerateMediumStringLength(MacroAssembler* masm);
   static void GenerateLongStringLength(MacroAssembler* masm);
   static void GenerateFunctionPrototype(MacroAssembler* masm);
 
  private:
   static void Generate(MacroAssembler* masm, const ExternalReference& f);
 
   // 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);
 
   // Stub accessors.
   static Code* megamorphic_stub() {
     return Builtins::builtin(Builtins::LoadIC_Megamorphic);
   }
   static Code* initialize_stub() {
     return Builtins::builtin(Builtins::LoadIC_Initialize);
   }
   static Code* pre_monomorphic_stub() {
     return Builtins::builtin(Builtins::LoadIC_PreMonomorphic);
   }
 
   static void Clear(Address address, Code* target);
   friend class IC;
 };
 
 
 class KeyedLoadIC: public IC {
  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);
   static void GenerateInitialize(MacroAssembler* masm);
   static void GeneratePreMonomorphic(MacroAssembler* masm);
   static void GenerateGeneric(MacroAssembler* masm);
 
  private:
   static void Generate(MacroAssembler* masm, const ExternalReference& f);
 
   // Update the inline cache.
   void UpdateCaches(LookupResult* lookup,
+                    State state,
                     Handle<Object> object,
                     Handle<String> name);
 
   // Stub accessors.
   static Code* initialize_stub() {
     return Builtins::builtin(Builtins::KeyedLoadIC_Initialize);
   }
   static Code* megamorphic_stub() {
     return Builtins::builtin(Builtins::KeyedLoadIC_Generic);
   }
   static Code* generic_stub() {
     return Builtins::builtin(Builtins::KeyedLoadIC_Generic);
   }
   static Code* pre_monomorphic_stub() {
     return Builtins::builtin(Builtins::KeyedLoadIC_PreMonomorphic);
   }
 
   static void Clear(Address address, Code* target);
   friend class IC;
 };
 
 
 class StoreIC: public IC {
  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);
 
   // Code generators for stub routines. Only called once at startup.
   static void GenerateInitialize(MacroAssembler* masm);
   static void GenerateMiss(MacroAssembler* masm);
   static void GenerateMegamorphic(MacroAssembler* masm);
 
  private:
   static void Generate(MacroAssembler* masm, const ExternalReference& f);
 
   // 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);
 
   // Stub accessors.
   static Code* megamorphic_stub() {
     return Builtins::builtin(Builtins::StoreIC_Megamorphic);
   }
   static Code* initialize_stub() {
     return Builtins::builtin(Builtins::StoreIC_Initialize);
   }
 
   static void Clear(Address address, Code* target);
   friend class IC;
 };
 
 
 class KeyedStoreIC: public IC {
  public:
   KeyedStoreIC() : IC(NO_EXTRA_FRAME) { }
 
-  Object* Store(Handle<Object> object,
+  Object* Store(State state,
+                Handle<Object> object,
                 Handle<Object> name,
                 Handle<Object> value);
 
   // Code generators for stub routines.  Only called once at startup.
   static void GenerateInitialize(MacroAssembler* masm);
   static void GenerateMiss(MacroAssembler* masm);
   static void GenerateGeneric(MacroAssembler* masm);
 
  private:
   static void Generate(MacroAssembler* masm, const ExternalReference& f);
 
   // Update the inline cache.
   void UpdateCaches(LookupResult* lookup,
+                    State state,
                     Handle<JSObject> receiver,
                     Handle<String> name,
                     Handle<Object> value);
 
   // Stub accessors.
   static Code* initialize_stub() {
     return Builtins::builtin(Builtins::KeyedStoreIC_Initialize);
   }
   static Code* megamorphic_stub() {
     return Builtins::builtin(Builtins::KeyedStoreIC_Generic);
   }
   static Code* generic_stub() {
     return Builtins::builtin(Builtins::KeyedStoreIC_Generic);
   }
 
   static void Clear(Address address, Code* target);
   friend class IC;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_IC_H_