[ic] LoadICState cleanup.

src/ic/ic.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/ic/ic.h"
 
 #include "src/accessors.h"
 #include "src/api-arguments-inl.h"
 #include "src/api.h"
 #include "src/arguments.h"
@@ skipping 483 matching lines @@
   if (stub.state() != CompareICState::KNOWN_RECEIVER) return;
   SetTargetAtAddress(address, GetRawUninitialized(isolate, stub.op()),
                      constant_pool);
   PatchInlinedSmiCode(isolate, address, DISABLE_INLINED_SMI_CHECK);
 }
 
 
 // static
 Handle<Code> KeyedLoadIC::ChooseMegamorphicStub(Isolate* isolate,
                                                 ExtraICState extra_state) {
+  // TODO(ishell): remove extra_ic_state
   if (FLAG_compiled_keyed_generic_loads) {
-    return KeyedLoadGenericStub(isolate, LoadICState(extra_state)).GetCode();
+    return KeyedLoadGenericStub(isolate).GetCode();
   } else {
     return isolate->builtins()->KeyedLoadIC_Megamorphic();
   }
 }
 
 
 static bool MigrateDeprecated(Handle<Object> object) {
   if (!object->IsJSObject()) return false;
   Handle<JSObject> receiver = Handle<JSObject>::cast(object);
   if (!receiver->map()->is_deprecated()) return false;
@@ skipping 310 matching lines @@
       // Indicate that we've handled this case.
       DCHECK(UseVector());
       vector_set_ = true;
       break;
     case GENERIC:
       UNREACHABLE();
       break;
   }
 }
 
-Handle<Code> LoadIC::initialize_stub_in_optimized_code(
-    Isolate* isolate, ExtraICState extra_state) {
+Handle<Code> LoadIC::initialize_stub_in_optimized_code(Isolate* isolate) {
   if (FLAG_tf_load_ic_stub) {
-    return LoadICTFStub(isolate, LoadICState(extra_state)).GetCode();
+    return LoadICTFStub(isolate).GetCode();
   }
-  return LoadICStub(isolate, LoadICState(extra_state)).GetCode();
+  return LoadICStub(isolate).GetCode();
 }
 
 Handle<Code> LoadGlobalIC::initialize_stub_in_optimized_code(
     Isolate* isolate, ExtraICState extra_state) {
-  return LoadGlobalICStub(isolate, LoadICState(extra_state)).GetCode();
+  return LoadGlobalICStub(isolate, LoadGlobalICState(extra_state)).GetCode();
 }
 
 Handle<Code> KeyedLoadIC::initialize_stub_in_optimized_code(
     Isolate* isolate, ExtraICState extra_state) {
-  return KeyedLoadICStub(isolate, LoadICState(extra_state)).GetCode();
+  // TODO(ishell): remove extra_ic_state
+  return KeyedLoadICStub(isolate).GetCode();
 }
 
 Handle<Code> KeyedStoreIC::initialize_stub_in_optimized_code(
     Isolate* isolate, LanguageMode language_mode) {
   StoreICState state = StoreICState(language_mode);
   return VectorKeyedStoreICStub(isolate, state).GetCode();
 }
 
 
 Handle<Code> KeyedStoreIC::ChooseMegamorphicStub(Isolate* isolate,
@@ skipping 2154 matching lines @@
     DCHECK_EQ(FeedbackVectorSlotKind::KEYED_LOAD_IC,
               vector->GetKind(vector_slot));
     KeyedLoadICNexus nexus(vector, vector_slot);
     KeyedLoadIC ic(IC::EXTRA_CALL_FRAME, isolate, &nexus);
     ic.UpdateState(receiver, key);
     RETURN_RESULT_OR_FAILURE(isolate, ic.Load(receiver, key));
   }
 }
 }  // namespace internal
 }  // namespace v8