[stubs] Using template magic to get the call interface descriptor type from callable.

src/code-factory.cc

 // Copyright 2014 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/code-factory.h"
 
 #include "src/bootstrapper.h"
 #include "src/ic/ic.h"
 
 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()));
 }
 
+// TODO(ishell): make it (const Stub& stub) once CodeStub::GetCode() is const.
+template <typename Stub>
+CallableD<typename Stub::Descriptor> make_callableD(Stub& stub) {
+  typedef typename Stub::Descriptor Descriptor;
+  return CallableD<Descriptor>(stub.GetCode(), stub.isolate());
+}
+
 }  // namespace
 
 // static
 Callable CodeFactory::LoadIC(Isolate* isolate) {
   if (FLAG_tf_load_ic_stub) {
     LoadICTrampolineTFStub stub(isolate);
     return make_callable(stub);
   }
   LoadICTrampolineStub stub(isolate);
   return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::ApiGetter(Isolate* isolate) {
   CallApiGetterStub stub(isolate);
   return make_callable(stub);
 }
 
 // static
-Callable CodeFactory::LoadICInOptimizedCode(Isolate* isolate) {
+CallableD<LoadWithVectorDescriptor> CodeFactory::LoadICInOptimizedCode(
+    Isolate* isolate) {
   if (FLAG_tf_load_ic_stub) {
     LoadICTFStub stub(isolate);
-    return make_callable(stub);
+    return make_callableD(stub);
   }
   LoadICStub stub(isolate);
-  return make_callable(stub);
+  return make_callableD(stub);
 }
 
 // static
 Callable CodeFactory::LoadGlobalIC(Isolate* isolate, TypeofMode typeof_mode) {
   LoadGlobalICTrampolineStub stub(isolate, LoadGlobalICState(typeof_mode));
   return make_callable(stub);
 }
 
 // static
-Callable CodeFactory::LoadGlobalICInOptimizedCode(Isolate* isolate,
-                                                  TypeofMode typeof_mode) {
+CallableD<LoadGlobalWithVectorDescriptor>
+CodeFactory::LoadGlobalICInOptimizedCode(Isolate* isolate,
+                                         TypeofMode typeof_mode) {
   LoadGlobalICStub stub(isolate, LoadGlobalICState(typeof_mode));
-  return make_callable(stub);
+  return make_callableD(stub);
 }
 
 // static
 Callable CodeFactory::KeyedLoadIC(Isolate* isolate) {
   if (FLAG_tf_load_ic_stub) {
     KeyedLoadICTrampolineTFStub stub(isolate);
     return make_callable(stub);
   }
   KeyedLoadICTrampolineStub stub(isolate);
   return make_callable(stub);
 }
 
 // static
-Callable CodeFactory::KeyedLoadICInOptimizedCode(Isolate* isolate) {
+CallableD<LoadWithVectorDescriptor> CodeFactory::KeyedLoadICInOptimizedCode(
+    Isolate* isolate) {
   if (FLAG_tf_load_ic_stub) {
     KeyedLoadICTFStub stub(isolate);
-    return make_callable(stub);
+    return make_callableD(stub);
   }
   KeyedLoadICStub stub(isolate);
-  return make_callable(stub);
+  return make_callableD(stub);
 }
 
 // static
 Callable CodeFactory::KeyedLoadIC_Megamorphic(Isolate* isolate) {
   return Callable(isolate->builtins()->KeyedLoadIC_Megamorphic(),
                   LoadWithVectorDescriptor(isolate));
 }
 
 // static
 Callable CodeFactory::CallIC(Isolate* isolate, int argc,
@@ skipping 11 matching lines @@
   return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::StoreIC(Isolate* isolate, LanguageMode language_mode) {
   StoreICTrampolineStub stub(isolate, StoreICState(language_mode));
   return make_callable(stub);
 }
 
 // static
-Callable CodeFactory::StoreICInOptimizedCode(Isolate* isolate,
-                                             LanguageMode language_mode) {
+CallableD<StoreWithVectorDescriptor> CodeFactory::StoreICInOptimizedCode(
+    Isolate* isolate, LanguageMode language_mode) {
   StoreICStub stub(isolate, StoreICState(language_mode));
-  return make_callable(stub);
+  return make_callableD(stub);
 }
 
 // static
 Callable CodeFactory::KeyedStoreIC(Isolate* isolate,
                                    LanguageMode language_mode) {
   KeyedStoreICTrampolineStub stub(isolate, StoreICState(language_mode));
   return make_callable(stub);
 }
 
 // static
-Callable CodeFactory::KeyedStoreICInOptimizedCode(Isolate* isolate,
-                                                  LanguageMode language_mode) {
+CallableD<StoreWithVectorDescriptor> CodeFactory::KeyedStoreICInOptimizedCode(
+    Isolate* isolate, LanguageMode language_mode) {
   KeyedStoreICStub stub(isolate, StoreICState(language_mode));
-  return make_callable(stub);
+  return make_callableD(stub);
 }
 
 // static
 Callable CodeFactory::CompareIC(Isolate* isolate, Token::Value op) {
   CompareICStub stub(isolate, op);
   return make_callable(stub);
 }
 
 // static
 Callable CodeFactory::BinaryOpIC(Isolate* isolate, Token::Value op) {
@@ skipping 450 matching lines @@
 }
 
 // static
 Callable CodeFactory::InterpreterOnStackReplacement(Isolate* isolate) {
   return Callable(isolate->builtins()->InterpreterOnStackReplacement(),
                   ContextOnlyDescriptor(isolate));
 }
 
 }  // namespace internal
 }  // namespace v8