Revert r19455 "Load target types and handlers before IC computation."

src/ic.h

 // Copyright 2012 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 132 matching lines @@
   static typename T::TypeHandle MapToType(Handle<Map> map,
                                           typename T::Region* region);
 
   static Handle<HeapType> CurrentTypeOf(Handle<Object> object,
                                         Isolate* isolate);
 
  protected:
   // Get the call-site target; used for determining the state.
   Handle<Code> target() const { return target_; }
 
-  TypeHandleList* types() { return &types_; }
-  CodeHandleList* handlers() { return &handlers_; }
-  Map* first_map() {
-    return types_.length() == 0 ? NULL : *TypeToMap(*types_.at(0), isolate_);
-  }
-  Code* first_handler() {
-    return handlers_.length() == 0 ? NULL : *handlers_.at(0);
-  }
-  void GetMapsFromTypes(MapHandleList* maps) {
-    for (int i = 0; i < types_.length(); ++i) {
-      maps->Add(TypeToMap(*types_.at(i), isolate_));
-    }
-  }
   Address fp() const { return fp_; }
   Address pc() const { return *pc_address_; }
   Isolate* isolate() const { return isolate_; }
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   // Computes the address in the original code when the code running is
   // containing break points (calls to DebugBreakXXX builtins).
   Address OriginalCodeAddress() const;
 #endif
 
@@ skipping 39 matching lines @@
                            Handle<Code> handler,
                            Handle<String> name);
 
   bool UpdatePolymorphicIC(Handle<HeapType> type,
                            Handle<String> name,
                            Handle<Code> code);
 
   virtual void UpdateMegamorphicCache(HeapType* type, Name* name, Code* code);
 
   void CopyICToMegamorphicCache(Handle<String> name);
-  bool IsTransitionOfMonomorphicTarget(Map* source_map, Map* target_map);
+  bool IsTransitionOfMonomorphicTarget(Handle<HeapType> type);
   void PatchCache(Handle<HeapType> type,
                   Handle<String> name,
                   Handle<Code> code);
   virtual Code::Kind kind() const {
     UNREACHABLE();
     return Code::STUB;
   }
   virtual Handle<Code> slow_stub() const {
     UNREACHABLE();
     return Handle<Code>::null();
@@ skipping 30 matching lines @@
 
   Isolate* isolate_;
 
   // The original code target that missed.
   Handle<Code> target_;
   State state_;
   bool target_set_;
 
   ExtraICState extra_ic_state_;
 
-  TypeHandleList types_;
-  CodeHandleList handlers_;
-
   DISALLOW_IMPLICIT_CONSTRUCTORS(IC);
 };
 
 
 // An IC_Utility encapsulates IC::UtilityId. It exists mainly because you
 // cannot make forward declarations to an enum.
 class IC_Utility {
  public:
   explicit IC_Utility(IC::UtilityId id)
     : address_(IC::AddressFromUtilityId(id)), id_(id) {}
@@ skipping 617 matching lines @@
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, ElementsTransitionAndStoreIC_Miss);
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, BinaryOpIC_Miss);
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, BinaryOpIC_MissWithAllocationSite);
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, CompareNilIC_Miss);
 DECLARE_RUNTIME_FUNCTION(MaybeObject*, ToBooleanIC_Miss);
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_IC_H_