Revert r20474

src/ic.cc

 // 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 73 matching lines @@
       Code* apply_builtin = isolate()->builtins()->builtin(
           Builtins::kFunctionApply);
       if (raw_frame->unchecked_code() == apply_builtin) {
         PrintF("apply from ");
         it.Advance();
         raw_frame = it.frame();
       }
     }
     JavaScriptFrame::PrintTop(isolate(), stdout, false, true);
     ExtraICState extra_state = new_target->extra_ic_state();
-    const char* modifier = "";
-    if (new_target->kind() == Code::KEYED_STORE_IC) {
-      modifier = GetTransitionMarkModifier(
-          KeyedStoreIC::GetKeyedAccessStoreMode(extra_state));
-    }
+    const char* modifier =
+        GetTransitionMarkModifier(
+            KeyedStoreIC::GetKeyedAccessStoreMode(extra_state));
     PrintF(" (%c->%c%s)",
            TransitionMarkFromState(state()),
            TransitionMarkFromState(new_state),
            modifier);
     name->Print();
     PrintF("]\n");
   }
 }
 
 #define TRACE_GENERIC_IC(isolate, type, reason)                 \
@@ skipping 301 matching lines @@
   Isolate* isolate = target->GetHeap()->isolate();
   Code* host = isolate->
       inner_pointer_to_code_cache()->GetCacheEntry(address)->code;
   if (host->kind() != Code::FUNCTION) return;
 
   if (FLAG_type_info_threshold > 0 &&
       old_target->is_inline_cache_stub() &&
       target->is_inline_cache_stub()) {
     int delta = ComputeTypeInfoCountDelta(old_target->ic_state(),
                                           target->ic_state());
-    // Call ICs don't have interesting state changes from this point
-    // of view.
-    ASSERT(target->kind() != Code::CALL_IC || delta == 0);
-
     // Not all Code objects have TypeFeedbackInfo.
     if (host->type_feedback_info()->IsTypeFeedbackInfo() && delta != 0) {
       TypeFeedbackInfo* info =
           TypeFeedbackInfo::cast(host->type_feedback_info());
       info->change_ic_with_type_info_count(delta);
     }
   }
   if (host->type_feedback_info()->IsTypeFeedbackInfo()) {
     TypeFeedbackInfo* info =
         TypeFeedbackInfo::cast(host->type_feedback_info());
@@ skipping 16 matching lines @@
 
   switch (target->kind()) {
     case Code::LOAD_IC:
       return LoadIC::Clear(isolate, address, target, constant_pool);
     case Code::KEYED_LOAD_IC:
       return KeyedLoadIC::Clear(isolate, address, target, constant_pool);
     case Code::STORE_IC:
       return StoreIC::Clear(isolate, address, target, constant_pool);
     case Code::KEYED_STORE_IC:
       return KeyedStoreIC::Clear(isolate, address, target, constant_pool);
-    case Code::CALL_IC:
-      return CallIC::Clear(isolate, address, target, constant_pool);
     case Code::COMPARE_IC:
       return CompareIC::Clear(isolate, address, target, constant_pool);
     case Code::COMPARE_NIL_IC:
       return CompareNilIC::Clear(address, target, constant_pool);
     case Code::BINARY_OP_IC:
     case Code::TO_BOOLEAN_IC:
       // Clearing these is tricky and does not
       // make any performance difference.
       return;
     default: UNREACHABLE();
   }
 }
 
 
 void KeyedLoadIC::Clear(Isolate* isolate,
                         Address address,
                         Code* target,
                         ConstantPoolArray* constant_pool) {
   if (IsCleared(target)) return;
   // Make sure to also clear the map used in inline fast cases.  If we
   // do not clear these maps, cached code can keep objects alive
   // through the embedded maps.
   SetTargetAtAddress(address, *pre_monomorphic_stub(isolate), constant_pool);
 }
 
 
-void CallIC::Clear(Isolate* isolate,
-                   Address address,
-                   Code* target,
-                   ConstantPoolArray* constant_pool) {
-  // CallIC just has a generic stub and a monomorphic stub. Only clear if we
-  // are monomorphic
-  if (target->ic_state() != ::v8::internal::MONOMORPHIC) return;
-
-  CallIC::State existing_state(target->extra_ic_state());
-
-  // Install default stub with the immutable parts of existing state.
-  HandleScope scope(isolate);
-  CallICStub stub(State::DefaultCallState(existing_state.arg_count(),
-                                          existing_state.call_type()));
-  Code* code = *stub.GetCode(isolate);
-  SetTargetAtAddress(address, code, constant_pool);
-}
-
-
 void LoadIC::Clear(Isolate* isolate,
                    Address address,
                    Code* target,
                    ConstantPoolArray* constant_pool) {
   if (IsCleared(target)) return;
   Code* code = target->GetIsolate()->stub_cache()->FindPreMonomorphicIC(
       Code::LOAD_IC, target->extra_ic_state());
   SetTargetAtAddress(address, code, constant_pool);
 }
 
@@ skipping 775 matching lines @@
   }
 
   // Set the property.
   Handle<Object> result = JSReceiver::SetProperty(
       receiver, name, value, NONE, strict_mode(), store_mode);
   RETURN_IF_EMPTY_HANDLE(isolate(), result);
   return *result;
 }
 
 
-void CallIC::State::Print(StringStream* stream) const {
-  stream->Add("(args(%d), ",
-              argc_);
-  stream->Add("%s, ",
-              call_type_ == CallIC::METHOD ? "METHOD" : "FUNCTION");
-  stream->Add("%s, ",
-              stub_type_ == CallIC::MONOMORPHIC ?
-              "MONOMORPHIC" : "NOT_MONOMORPHIC");
-  stream->Add("%s, ",
-              argument_check_ == CallIC::ARGUMENTS_MUST_MATCH ?
-              "args_must_match" : "args_might_match");
-  stream->Add("%s)",
-              strict_mode_ == STRICT ?
-              "strict" : "sloppy");
-}
-
-
-Handle<Code> CallIC::initialize_stub(Isolate* isolate,
-                                     int argc,
-                                     CallType call_type) {
-  CallICStub stub(State::DefaultCallState(argc, call_type));
-  Handle<Code> code = stub.GetCode(isolate);
-  return code;
-}
-
-
 Handle<Code> StoreIC::initialize_stub(Isolate* isolate,
                                       StrictMode strict_mode) {
   ExtraICState extra_state = ComputeExtraICState(strict_mode);
   Handle<Code> ic = isolate->stub_cache()->ComputeStore(
       UNINITIALIZED, extra_state);
   return ic;
 }
 
 
 Handle<Code> StoreIC::megamorphic_stub() {
@@ skipping 452 matching lines @@
   if (maybe_object) return maybe_object;
   Handle<Object> result = Runtime::SetObjectProperty(isolate(), object, key,
                                                      value,
                                                      NONE,
                                                      strict_mode());
   RETURN_IF_EMPTY_HANDLE(isolate(), result);
   return *result;
 }
 
 
-CallIC::State::State(ExtraICState extra_ic_state)
-    : argc_(ArgcBits::decode(extra_ic_state)),
-      call_type_(CallTypeBits::decode(extra_ic_state)),
-      stub_type_(StubTypeBits::decode(extra_ic_state)),
-      argument_check_(ArgumentCheckBits::decode(extra_ic_state)),
-      strict_mode_(StrictModeBits::decode(extra_ic_state)) {
-}
-
-
-ExtraICState CallIC::State::GetExtraICState() const {
-  ExtraICState extra_ic_state =
-      ArgcBits::encode(argc_) |
-      CallTypeBits::encode(call_type_) |
-      StubTypeBits::encode(stub_type_) |
-      ArgumentCheckBits::encode(argument_check_) |
-      StrictModeBits::encode(strict_mode_);
-  return extra_ic_state;
-}
-
-
-CallIC::State CallIC::State::ToGenericState() {
-  if (stub_type() == CallIC::MONOMORPHIC) {
-    return DefaultCallState(arg_count(), call_type());
-  }
-  return *this;
-}
-
-
-CallIC::State CallIC::State::ToMonomorphicState(
-    Handle<JSFunction> function) {
-  // Choose the right monomorphic handler
-  SharedFunctionInfo* shared = function->shared();
-  ArgumentCheck new_argument_check =
-      shared->formal_parameter_count() == arg_count()
-      ? CallIC::ARGUMENTS_MUST_MATCH
-      : CallIC::ARGUMENTS_COUNT_UNKNOWN;
-  StrictMode new_strict_mode = shared->strict_mode();
-  if (new_argument_check != argument_check() ||
-      new_strict_mode != strict_mode()) {
-    return MonomorphicCallState(arg_count(), call_type(), new_argument_check,
-                                new_strict_mode);
-  }
-
-  return *this;
-}
-
-
-void CallIC::HandleMiss(Handle<Object> receiver,
-                        Handle<Object> function,
-                        Handle<FixedArray> vector,
-                        Handle<Smi> slot) {
-  State state(target()->extra_ic_state());
-  Object* feedback = vector->get(slot->value());
-
-  if (feedback->IsJSFunction() || !function->IsJSFunction()) {
-    // We are going generic.
-    ASSERT(!function->IsJSFunction() || *function != feedback);
-
-    vector->set(slot->value(),
-                *TypeFeedbackInfo::MegamorphicSentinel(isolate()));
-
-    // We only need to patch if we currently don't have the default stub in
-    // place.
-    State new_state = state.ToGenericState();
-    if (new_state != state) {
-      CallICStub stub(new_state);
-      set_target(*stub.GetCode(isolate()));
-      TRACE_GENERIC_IC(isolate(), "CallIC", "generic");
-    }
-  } else {
-    // If we came here feedback must be the uninitialized sentinel,
-    // and we are going monomorphic.
-    ASSERT(feedback == *TypeFeedbackInfo::UninitializedSentinel(isolate()));
-    ASSERT(state.stub_type() != CallIC::MONOMORPHIC);
-
-    vector->set(slot->value(), *function);
-
-    // Choose the right monomorphic handler
-    Handle<JSFunction> js_function = Handle<JSFunction>::cast(function);
-    State new_state = state.ToMonomorphicState(js_function);
-    if (new_state != state) {
-      CallICStub stub(new_state);
-      set_target(*stub.GetCode(isolate()));
-      TRACE_IC("CallIC", Handle<Object>(js_function->shared()->name(),
-                                        isolate()));
-    }
-  }
-}
-
-
 #undef TRACE_IC
 
 
 // ----------------------------------------------------------------------------
 // Static IC stub generators.
 //
 
 // Used from ic-<arch>.cc.
-RUNTIME_FUNCTION(MaybeObject*, CallIC_Miss) {
-  HandleScope scope(isolate);
-  ASSERT(args.length() == 4);
-  CallIC ic(isolate);
-  Handle<Object> receiver = args.at<Object>(0);
-  Handle<Object> function = args.at<Object>(1);
-  Handle<FixedArray> vector = args.at<FixedArray>(2);
-  Handle<Smi> slot = args.at<Smi>(3);
-  ic.HandleMiss(receiver, function, vector, slot);
-  return *function;
-}
-
-
 // Used from ic-<arch>.cc.
 RUNTIME_FUNCTION(MaybeObject*, LoadIC_Miss) {
   HandleScope scope(isolate);
   ASSERT(args.length() == 2);
   LoadIC ic(IC::NO_EXTRA_FRAME, isolate);
   Handle<Object> receiver = args.at<Object>(0);
   Handle<String> key = args.at<String>(1);
   ic.UpdateState(receiver, key);
   return ic.Load(receiver, key);
 }
@@ skipping 1068 matching lines @@
 #undef ADDR
 };
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) {
   return IC_utilities[id];
 }
 
 
 } }  // namespace v8::internal