[stubs] Cleanup CodeFactory.

src/code-factory.cc

Index: src/code-factory.cc
diff --git a/src/code-factory.cc b/src/code-factory.cc
index 0fb5c108dc18f0dc879c262a0deee61c1b3c6636..63cd5d0765e6d5c6a55bba10316806eb8cf9260e 100644
--- a/src/code-factory.cc
+++ b/src/code-factory.cc
@@ -10,58 +10,74 @@
 namespace v8 {
 namespace internal {
 
+namespace {
+
+// TODO(ishell): make it (const Stub& stub) once CodeStub::GetCode() is const.
+template <typename Stub>
+Callable make_callable(Stub& stub) {
+  typedef typename Stub::Descriptor Descriptor;
+  return Callable(stub.GetCode(), Descriptor(stub.isolate()));
+}
+
+}  // namespace
 
 // static
 Callable CodeFactory::LoadIC(Isolate* isolate) {
   if (FLAG_tf_load_ic_stub) {
     LoadICTrampolineTFStub stub(isolate);
-    return Callable(stub.GetCode(), LoadDescriptor(isolate));
+    return make_callable(stub);
   }
   LoadICTrampolineStub stub(isolate);
-  return Callable(stub.GetCode(), LoadDescriptor(isolate));
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::ApiGetter(Isolate* isolate) {
   CallApiGetterStub stub(isolate);
-  return Callable(stub.GetCode(), ApiGetterDescriptor(isolate));
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::LoadICInOptimizedCode(Isolate* isolate) {
-  auto code = LoadIC::initialize_stub_in_optimized_code(isolate);
-  return Callable(code, LoadWithVectorDescriptor(isolate));
+  if (FLAG_tf_load_ic_stub) {
+    LoadICTFStub stub(isolate);
+    return make_callable(stub);
+  }
+  LoadICStub stub(isolate);
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::LoadGlobalIC(Isolate* isolate, TypeofMode typeof_mode) {
   LoadGlobalICTrampolineStub stub(isolate, LoadGlobalICState(typeof_mode));
-  return Callable(stub.GetCode(), LoadGlobalDescriptor(isolate));
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::LoadGlobalICInOptimizedCode(Isolate* isolate,
                                                   TypeofMode typeof_mode) {
-  auto code = LoadGlobalIC::initialize_stub_in_optimized_code(
-      isolate, LoadGlobalICState(typeof_mode).GetExtraICState());
-  return Callable(code, LoadGlobalWithVectorDescriptor(isolate));
+  LoadGlobalICStub stub(isolate, LoadGlobalICState(typeof_mode));
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::KeyedLoadIC(Isolate* isolate) {
   if (FLAG_tf_load_ic_stub) {
     KeyedLoadICTrampolineTFStub stub(isolate);
-    return Callable(stub.GetCode(), LoadDescriptor(isolate));
+    return make_callable(stub);
   }
   KeyedLoadICTrampolineStub stub(isolate);
-  return Callable(stub.GetCode(), LoadDescriptor(isolate));
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::KeyedLoadICInOptimizedCode(Isolate* isolate) {
-  auto code = KeyedLoadIC::initialize_stub_in_optimized_code(isolate);
-  return Callable(code, LoadWithVectorDescriptor(isolate));
+  if (FLAG_tf_load_ic_stub) {
+    KeyedLoadICTFStub stub(isolate);
+    return make_callable(stub);
+  }
+  KeyedLoadICStub stub(isolate);
+  return make_callable(stub);
 }
 
 // static
@@ -75,80 +91,66 @@ Callable CodeFactory::CallIC(Isolate* isolate, int argc,
                              ConvertReceiverMode mode,
                              TailCallMode tail_call_mode) {
   CallICTrampolineStub stub(isolate, CallICState(argc, mode, tail_call_mode));
-  return Callable(stub.GetCode(), CallFunctionWithFeedbackDescriptor(isolate));
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::CallICInOptimizedCode(Isolate* isolate, int argc,
                                             ConvertReceiverMode mode,
                                             TailCallMode tail_call_mode) {
-  return Callable(CallIC::initialize_stub_in_optimized_code(isolate, argc, mode,
-                                                            tail_call_mode),
-                  CallFunctionWithFeedbackAndVectorDescriptor(isolate));
+  CallICStub stub(isolate, CallICState(argc, mode, tail_call_mode));
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::StoreIC(Isolate* isolate, LanguageMode language_mode) {
   StoreICTrampolineStub stub(isolate, StoreICState(language_mode));
-  return Callable(stub.GetCode(), StoreDescriptor(isolate));
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::StoreICInOptimizedCode(Isolate* isolate,
                                              LanguageMode language_mode) {
-  CallInterfaceDescriptor descriptor = StoreWithVectorDescriptor(isolate);
-  return Callable(
-      StoreIC::initialize_stub_in_optimized_code(isolate, language_mode),
-      descriptor);
+  StoreICStub stub(isolate, StoreICState(language_mode));
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::KeyedStoreIC(Isolate* isolate,
                                    LanguageMode language_mode) {
   KeyedStoreICTrampolineStub stub(isolate, StoreICState(language_mode));
-  return Callable(stub.GetCode(), StoreDescriptor(isolate));
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::KeyedStoreICInOptimizedCode(Isolate* isolate,
                                                   LanguageMode language_mode) {
-  CallInterfaceDescriptor descriptor = StoreWithVectorDescriptor(isolate);
-  return Callable(
-      KeyedStoreIC::initialize_stub_in_optimized_code(isolate, language_mode),
-      descriptor);
+  KeyedStoreICStub stub(isolate, StoreICState(language_mode));
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::CompareIC(Isolate* isolate, Token::Value op) {
-  Handle<Code> code = CompareIC::GetUninitialized(isolate, op);
-  return Callable(code, CompareDescriptor(isolate));
+  CompareICStub stub(isolate, op);
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::BinaryOpIC(Isolate* isolate, Token::Value op) {
   BinaryOpICStub stub(isolate, op);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::InstanceOf(Isolate* isolate) {
   InstanceOfStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::GetProperty(Isolate* isolate) {
   GetPropertyStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
@@ -157,14 +159,12 @@ Callable CodeFactory::ToBoolean(Isolate* isolate) {
                   TypeConversionDescriptor(isolate));
 }
 
-
 // static
 Callable CodeFactory::ToNumber(Isolate* isolate) {
   return Callable(isolate->builtins()->ToNumber(),
                   TypeConversionDescriptor(isolate));
 }
 
-
 // static
 Callable CodeFactory::NonNumberToNumber(Isolate* isolate) {
   return Callable(isolate->builtins()->NonNumberToNumber(),
@@ -180,34 +180,31 @@ Callable CodeFactory::StringToNumber(Isolate* isolate) {
 // static
 Callable CodeFactory::ToString(Isolate* isolate) {
   ToStringStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::ToName(Isolate* isolate) {
   ToNameStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::ToInteger(Isolate* isolate) {
   ToIntegerStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::ToLength(Isolate* isolate) {
   ToLengthStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::ToObject(Isolate* isolate) {
   ToObjectStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
@@ -227,16 +224,15 @@ Callable CodeFactory::OrdinaryToPrimitive(Isolate* isolate,
 // static
 Callable CodeFactory::NumberToString(Isolate* isolate) {
   NumberToStringStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::RegExpConstructResult(Isolate* isolate) {
   RegExpConstructResultStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::RegExpExec(Isolate* isolate) {
   RegExpExecStub stub(isolate);
@@ -246,134 +242,134 @@ Callable CodeFactory::RegExpExec(Isolate* isolate) {
 // static
 Callable CodeFactory::Add(Isolate* isolate) {
   AddStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::Subtract(Isolate* isolate) {
   SubtractStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::Multiply(Isolate* isolate) {
   MultiplyStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::Divide(Isolate* isolate) {
   DivideStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::Modulus(Isolate* isolate) {
   ModulusStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::ShiftRight(Isolate* isolate) {
   ShiftRightStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::ShiftRightLogical(Isolate* isolate) {
   ShiftRightLogicalStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::ShiftLeft(Isolate* isolate) {
   ShiftLeftStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::BitwiseAnd(Isolate* isolate) {
   BitwiseAndStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::BitwiseOr(Isolate* isolate) {
   BitwiseOrStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::BitwiseXor(Isolate* isolate) {
   BitwiseXorStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::Inc(Isolate* isolate) {
   IncStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::Dec(Isolate* isolate) {
   DecStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::LessThan(Isolate* isolate) {
   LessThanStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::LessThanOrEqual(Isolate* isolate) {
   LessThanOrEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::GreaterThan(Isolate* isolate) {
   GreaterThanStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::GreaterThanOrEqual(Isolate* isolate) {
   GreaterThanOrEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::Equal(Isolate* isolate) {
   EqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::NotEqual(Isolate* isolate) {
   NotEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StrictEqual(Isolate* isolate) {
   StrictEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StrictNotEqual(Isolate* isolate) {
   StrictNotEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StringAdd(Isolate* isolate, StringAddFlags flags,
                                 PretenureFlag pretenure_flag) {
   StringAddStub stub(isolate, flags, pretenure_flag);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
@@ -403,37 +399,37 @@ Callable CodeFactory::StringCompare(Isolate* isolate, Token::Value token) {
 // static
 Callable CodeFactory::StringEqual(Isolate* isolate) {
   StringEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StringNotEqual(Isolate* isolate) {
   StringNotEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StringLessThan(Isolate* isolate) {
   StringLessThanStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StringLessThanOrEqual(Isolate* isolate) {
   StringLessThanOrEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StringGreaterThan(Isolate* isolate) {
   StringGreaterThanStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StringGreaterThanOrEqual(Isolate* isolate) {
   StringGreaterThanOrEqualStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
@@ -442,7 +438,6 @@ Callable CodeFactory::SubString(Isolate* isolate) {
   return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
 }
 
-
 // static
 Callable CodeFactory::ResumeGenerator(Isolate* isolate) {
   return Callable(isolate->builtins()->ResumeGeneratorTrampoline(),
@@ -452,87 +447,78 @@ Callable CodeFactory::ResumeGenerator(Isolate* isolate) {
 // static
 Callable CodeFactory::Typeof(Isolate* isolate) {
   TypeofStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::FastCloneRegExp(Isolate* isolate) {
   FastCloneRegExpStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::FastCloneShallowArray(Isolate* isolate) {
   // TODO(mstarzinger): Thread through AllocationSiteMode at some point.
   FastCloneShallowArrayStub stub(isolate, DONT_TRACK_ALLOCATION_SITE);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::FastCloneShallowObject(Isolate* isolate, int length) {
   FastCloneShallowObjectStub stub(isolate, length);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 
 // static
 Callable CodeFactory::FastNewContext(Isolate* isolate, int slot_count) {
   FastNewFunctionContextStub stub(isolate, slot_count);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::FastNewClosure(Isolate* isolate) {
   FastNewClosureStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::FastNewObject(Isolate* isolate) {
   FastNewObjectStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::FastNewRestParameter(Isolate* isolate,
                                            bool skip_stub_frame) {
   FastNewRestParameterStub stub(isolate, skip_stub_frame);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::FastNewSloppyArguments(Isolate* isolate,
                                              bool skip_stub_frame) {
   FastNewSloppyArgumentsStub stub(isolate, skip_stub_frame);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::FastNewStrictArguments(Isolate* isolate,
                                              bool skip_stub_frame) {
   FastNewStrictArgumentsStub stub(isolate, skip_stub_frame);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-
 // static
 Callable CodeFactory::AllocateHeapNumber(Isolate* isolate) {
   AllocateHeapNumberStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
-#define SIMD128_ALLOC(TYPE, Type, type, lane_count, lane_type)          \
-  Callable CodeFactory::Allocate##Type(Isolate* isolate) {              \
-    Allocate##Type##Stub stub(isolate);                                 \
-    return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor()); \
+#define SIMD128_ALLOC(TYPE, Type, type, lane_count, lane_type) \
+  Callable CodeFactory::Allocate##Type(Isolate* isolate) {     \
+    Allocate##Type##Stub stub(isolate);                        \
+    return make_callable(stub);                                \
   }
 SIMD128_TYPES(SIMD128_ALLOC)
 #undef SIMD128_ALLOC
@@ -543,7 +529,6 @@ Callable CodeFactory::ArgumentAdaptor(Isolate* isolate) {
                   ArgumentAdaptorDescriptor(isolate));
 }
 
-
 // static
 Callable CodeFactory::Call(Isolate* isolate, ConvertReceiverMode mode,
                            TailCallMode tail_call_mode) {
@@ -551,21 +536,18 @@ Callable CodeFactory::Call(Isolate* isolate, ConvertReceiverMode mode,
                   CallTrampolineDescriptor(isolate));
 }
 
-
 // static
 Callable CodeFactory::CallFunction(Isolate* isolate, ConvertReceiverMode mode) {
   return Callable(isolate->builtins()->CallFunction(mode),
                   CallTrampolineDescriptor(isolate));
 }
 
-
 // static
 Callable CodeFactory::Construct(Isolate* isolate) {
   return Callable(isolate->builtins()->Construct(),
                   ConstructTrampolineDescriptor(isolate));
 }
 
-
 // static
 Callable CodeFactory::ConstructFunction(Isolate* isolate) {
   return Callable(isolate->builtins()->ConstructFunction(),
@@ -575,13 +557,13 @@ Callable CodeFactory::ConstructFunction(Isolate* isolate) {
 // static
 Callable CodeFactory::HasProperty(Isolate* isolate) {
   HasPropertyStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::ForInFilter(Isolate* isolate) {
   ForInFilterStub stub(isolate);
-  return Callable(stub.GetCode(), stub.GetCallInterfaceDescriptor());
+  return make_callable(stub);
 }
 
 // static
@@ -593,14 +575,12 @@ Callable CodeFactory::InterpreterPushArgsAndCall(Isolate* isolate,
                   InterpreterPushArgsAndCallDescriptor(isolate));
 }
 
-
 // static
 Callable CodeFactory::InterpreterPushArgsAndConstruct(Isolate* isolate) {
   return Callable(isolate->builtins()->InterpreterPushArgsAndConstruct(),
                   InterpreterPushArgsAndConstructDescriptor(isolate));
 }
 
-
 // static
 Callable CodeFactory::InterpreterCEntry(Isolate* isolate, int result_size) {
   // Note: If we ever use fpregs in the interpreter then we will need to