Revert r20474

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 24 matching lines @@
 
 
 const int kMaxKeyedPolymorphism = 4;
 
 
 // IC_UTIL_LIST defines all utility functions called from generated
 // inline caching code. The argument for the macro, ICU, is the function name.
 #define IC_UTIL_LIST(ICU)                             \
   ICU(LoadIC_Miss)                                    \
   ICU(KeyedLoadIC_Miss)                               \
-  ICU(CallIC_Miss)                                    \
   ICU(StoreIC_Miss)                                   \
   ICU(StoreIC_ArrayLength)                            \
   ICU(StoreIC_Slow)                                   \
   ICU(SharedStoreIC_ExtendStorage)                    \
   ICU(KeyedStoreIC_Miss)                              \
   ICU(KeyedStoreIC_Slow)                              \
   /* Utilities for IC stubs. */                       \
   ICU(StoreCallbackProperty)                          \
   ICU(LoadPropertyWithInterceptorOnly)                \
   ICU(LoadPropertyWithInterceptorForLoad)             \
@@ skipping 57 matching lines @@
                     ConstantPoolArray* constant_pool);
 
 #ifdef DEBUG
   bool IsLoadStub() const {
     return target()->is_load_stub() || target()->is_keyed_load_stub();
   }
 
   bool IsStoreStub() const {
     return target()->is_store_stub() || target()->is_keyed_store_stub();
   }
-
-  bool IsCallStub() const {
-    return target()->is_call_stub();
-  }
 #endif
 
   // Determines which map must be used for keeping the code stub.
   // These methods should not be called with undefined or null.
   static inline InlineCacheHolderFlag GetCodeCacheForObject(Object* object);
   // TODO(verwaest): This currently returns a HeapObject rather than JSObject*
   // since loading the IC for loading the length from strings are stored on
   // the string map directly, rather than on the JSObject-typed prototype.
   static inline HeapObject* GetCodeCacheHolder(Isolate* isolate,
                                                Object* object,
@@ skipping 200 matching lines @@
 
   Address address() const { return address_; }
 
   IC::UtilityId id() const { return id_; }
  private:
   Address address_;
   IC::UtilityId id_;
 };
 
 
-class CallIC: public IC {
- public:
-  enum CallType { METHOD, FUNCTION };
-  enum StubType { DEFAULT, MONOMORPHIC };
-  enum ArgumentCheck { ARGUMENTS_MUST_MATCH, ARGUMENTS_COUNT_UNKNOWN };
-
-  class State V8_FINAL BASE_EMBEDDED {
-   public:
-    explicit State(ExtraICState extra_ic_state);
-
-    static State MonomorphicCallState(int argc, CallType call_type,
-                                      ArgumentCheck argument_check,
-                                      StrictMode strict_mode) {
-      return State(argc, call_type, MONOMORPHIC, argument_check, strict_mode);
-    }
-
-    static State SlowCallState(int argc, CallType call_type) {
-      return State(argc, call_type, DEFAULT, ARGUMENTS_COUNT_UNKNOWN,
-                   SLOPPY);
-    }
-
-    static State DefaultCallState(int argc, CallType call_type) {
-      return State(argc, call_type, DEFAULT, ARGUMENTS_MUST_MATCH,
-                   SLOPPY);
-    }
-
-    // Transition from the current state to another.
-    State ToGenericState();
-    State ToMonomorphicState(Handle<JSFunction> function);
-
-    InlineCacheState GetICState() const {
-      return stub_type_ == CallIC::MONOMORPHIC
-          ? ::v8::internal::MONOMORPHIC
-          : ::v8::internal::GENERIC;
-    }
-
-    ExtraICState GetExtraICState() const;
-
-    static void GenerateAheadOfTime(
-        Isolate*, void (*Generate)(Isolate*, const State&));
-
-    int arg_count() const { return argc_; }
-    CallType call_type() const { return call_type_; }
-    StubType stub_type() const { return stub_type_; }
-    ArgumentCheck argument_check() const { return argument_check_; }
-    StrictMode strict_mode() const {
-      return strict_mode_;
-    }
-
-    bool ArgumentsMustMatch() const {
-      return argument_check_ == ARGUMENTS_MUST_MATCH;
-    }
-    bool IsGeneric() const { return stub_type_ == DEFAULT; }
-    bool CallAsMethod() const { return call_type_ == METHOD; }
-    bool IsSloppy() const {
-      return strict_mode_ == SLOPPY;
-    }
-
-    void Print(StringStream* stream) const;
-
-    bool operator==(const State& other_state) const {
-      return (argc_ == other_state.argc_ &&
-              call_type_ == other_state.call_type_ &&
-              stub_type_ == other_state.stub_type_ &&
-              argument_check_ == other_state.argument_check_ &&
-              strict_mode_ == other_state.strict_mode_);
-    }
-
-    bool operator!=(const State& other_state) const {
-      return !(*this == other_state);
-    }
-
-   private:
-    State(int argc,
-          CallType call_type,
-          StubType stub_type,
-          ArgumentCheck argument_check,
-          StrictMode strict_mode)
-        : argc_(argc),
-        call_type_(call_type),
-        stub_type_(stub_type),
-        argument_check_(argument_check),
-        strict_mode_(strict_mode) {
-    }
-
-    class ArgcBits: public BitField<int, 0, Code::kArgumentsBits> {};
-    class CallTypeBits: public BitField<CallType, Code::kArgumentsBits, 1> {};
-    class StubTypeBits:
-        public BitField<StubType, Code::kArgumentsBits + 1, 1> {};  // NOLINT
-    class ArgumentCheckBits:
-        public BitField<ArgumentCheck,
-            Code::kArgumentsBits + 2, 1> {};  // NOLINT
-    class StrictModeBits:
-        public BitField<StrictMode,
-            Code::kArgumentsBits + 3, 1> {};  // NOLINT
-
-    const int argc_;
-    const CallType call_type_;
-    const StubType stub_type_;
-    const ArgumentCheck argument_check_;
-    const StrictMode strict_mode_;
-  };
-
-  explicit CallIC(Isolate* isolate)
-      : IC(EXTRA_CALL_FRAME, isolate) {
-  }
-
-  void HandleMiss(Handle<Object> receiver,
-                  Handle<Object> function,
-                  Handle<FixedArray> vector,
-                  Handle<Smi> slot);
-
-  // Code generator routines.
-  static Handle<Code> initialize_stub(Isolate* isolate,
-                                      int argc,
-                                      CallType call_type);
-
-  static void Clear(Isolate* isolate, Address address, Code* target,
-                    ConstantPoolArray* constant_pool);
-};
-
-
 class LoadIC: public IC {
  public:
   // ExtraICState bits
   class ContextualModeBits: public BitField<ContextualMode, 0, 1> {};
   STATIC_ASSERT(static_cast<int>(NOT_CONTEXTUAL) == 0);
 
   static ExtraICState ComputeExtraICState(ContextualMode contextual_mode) {
     return ContextualModeBits::encode(contextual_mode);
   }
 
@@ skipping 613 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_