Revert r20474

src/code-stubs.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 33 matching lines @@
   V(BinaryOpIC)                          \
   V(BinaryOpICWithAllocationSite)        \
   V(BinaryOpWithAllocationSite)          \
   V(StringAdd)                           \
   V(SubString)                           \
   V(StringCompare)                       \
   V(Compare)                             \
   V(CompareIC)                           \
   V(CompareNilIC)                        \
   V(MathPow)                             \
-  V(CallIC)                              \
   V(FunctionPrototype)                   \
   V(RecordWrite)                         \
   V(StoreBufferOverflow)                 \
   V(RegExpExec)                          \
   V(Instanceof)                          \
   V(ConvertToDouble)                     \
   V(WriteInt32ToHeapNumber)              \
   V(StackCheck)                          \
   V(Interrupt)                           \
   V(FastNewClosure)                      \
@@ skipping 768 matching lines @@
 
   virtual int MinorKey() {
     return KindBits::encode(kind_);
   }
 
  private:
   Code::Kind kind_;
 };
 
 
-class CallICStub: public PlatformCodeStub {
- public:
-  explicit CallICStub(const CallIC::State& state)
-      : state_(state) {}
-
-  bool CallAsMethod() const { return state_.CallAsMethod(); }
-  bool IsGeneric() const {
-    return state_.IsGeneric();
-  }
-  bool ArgumentsMustMatch() const {
-    return state_.ArgumentsMustMatch();
-  }
-  bool IsSloppy() const {
-    return state_.IsSloppy();
-  }
-
-  int arg_count() const { return state_.arg_count(); }
-
-  static int ExtractArgcFromMinorKey(int minor_key) {
-    CallIC::State state((ExtraICState) minor_key);
-    return state.arg_count();
-  }
-
-  virtual void Generate(MacroAssembler* masm);
-
-  virtual Code::Kind GetCodeKind() const V8_OVERRIDE {
-    return Code::CALL_IC;
-  }
-
-  virtual InlineCacheState GetICState() V8_FINAL V8_OVERRIDE {
-    return state_.GetICState();
-  }
-
-  virtual ExtraICState GetExtraICState() V8_FINAL V8_OVERRIDE {
-    return state_.GetExtraICState();
-  }
-
- protected:
-  virtual int MinorKey() { return GetExtraICState(); }
-  virtual void PrintState(StringStream* stream) V8_FINAL V8_OVERRIDE;
-
- private:
-  virtual CodeStub::Major MajorKey() { return CallIC; }
-
-  // Code generation helpers.
-  void GenerateMonomorphicCall(MacroAssembler* masm);
-  void GenerateSlowCall(MacroAssembler* masm);
-  void GenerateMiss(MacroAssembler* masm);
-
-  CallIC::State state_;
-};
-
-
 class FunctionPrototypeStub: public ICStub {
  public:
   explicit FunctionPrototypeStub(Code::Kind kind) : ICStub(kind) { }
   virtual void Generate(MacroAssembler* masm);
 
  private:
   virtual CodeStub::Major MajorKey() { return FunctionPrototype; }
 };
 
 
@@ skipping 771 matching lines @@
 };
 
 
 class CallFunctionStub: public PlatformCodeStub {
  public:
   CallFunctionStub(int argc, CallFunctionFlags flags)
       : argc_(argc), flags_(flags) { }
 
   void Generate(MacroAssembler* masm);
 
+  virtual void FinishCode(Handle<Code> code) {
+    code->set_has_function_cache(RecordCallTarget());
+  }
+
   static int ExtractArgcFromMinorKey(int minor_key) {
     return ArgcBits::decode(minor_key);
   }
 
  private:
   int argc_;
   CallFunctionFlags flags_;
 
   virtual void PrintName(StringStream* stream);
 
   // Minor key encoding in 32 bits with Bitfield <Type, shift, size>.
   class FlagBits: public BitField<CallFunctionFlags, 0, 2> {};
   class ArgcBits: public BitField<unsigned, 2, 32 - 2> {};
 
   Major MajorKey() { return CallFunction; }
   int MinorKey() {
     // Encode the parameters in a unique 32 bit value.
     return FlagBits::encode(flags_) | ArgcBits::encode(argc_);
   }
 
+  bool RecordCallTarget() {
+    return flags_ == RECORD_CALL_TARGET;
+  }
+
   bool CallAsMethod() {
     return flags_ == CALL_AS_METHOD || flags_ == WRAP_AND_CALL;
   }
 
   bool NeedsChecks() {
     return flags_ != WRAP_AND_CALL;
   }
 };
 
 
 class CallConstructStub: public PlatformCodeStub {
  public:
-  explicit CallConstructStub(CallConstructorFlags flags) : flags_(flags) {}
+  explicit CallConstructStub(CallFunctionFlags flags) : flags_(flags) {}
 
   void Generate(MacroAssembler* masm);
 
   virtual void FinishCode(Handle<Code> code) {
     code->set_has_function_cache(RecordCallTarget());
   }
 
  private:
-  CallConstructorFlags flags_;
+  CallFunctionFlags flags_;
 
   virtual void PrintName(StringStream* stream);
 
   Major MajorKey() { return CallConstruct; }
   int MinorKey() { return flags_; }
 
   bool RecordCallTarget() {
-    return (flags_ & RECORD_CONSTRUCTOR_TARGET) != 0;
+    return (flags_ & RECORD_CALL_TARGET) != 0;
+  }
+
+  bool CallAsMethod() {
+    return (flags_ & CALL_AS_METHOD) != 0;
   }
 };
 
 
 enum StringIndexFlags {
   // Accepts smis or heap numbers.
   STRING_INDEX_IS_NUMBER,
 
   // Accepts smis or heap numbers that are valid array indices
   // (ECMA-262 15.4). Invalid indices are reported as being out of
@@ skipping 819 matching lines @@
 
 
 class CallDescriptors {
  public:
   static void InitializeForIsolate(Isolate* isolate);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_