Make concrete classes for individual call descriptors.

src/code-stubs.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/v8.h"
 
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
 #include "src/cpu-profiler.h"
 #include "src/factory.h"
 #include "src/gdb-jit.h"
 #include "src/ic/handler-compiler.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
 namespace internal {
 
 
 CodeStubInterfaceDescriptor::CodeStubInterfaceDescriptor()
-    : call_descriptor_(NULL),
-      stack_parameter_count_(no_reg),
+    : stack_parameter_count_(no_reg),
       hint_stack_parameter_count_(-1),
       function_mode_(NOT_JS_FUNCTION_STUB_MODE),
       deoptimization_handler_(NULL),
       handler_arguments_mode_(DONT_PASS_ARGUMENTS),
       miss_handler_(),
       has_miss_handler_(false) {}
 
 
 void CodeStubInterfaceDescriptor::Initialize(
-    CodeStub::Major major, CallInterfaceDescriptor* call_descriptor,
+    CodeStub::Major major, CallInterfaceDescriptor call_descriptor,
     Address deoptimization_handler, int hint_stack_parameter_count,
     StubFunctionMode function_mode) {
   call_descriptor_ = call_descriptor;
   deoptimization_handler_ = deoptimization_handler;
   hint_stack_parameter_count_ = hint_stack_parameter_count;
   function_mode_ = function_mode;
   major_ = major;

[Yang, 2014/09/03 09:24:34]

not sure whether an initialization list would be more readable.

 }
 
 
 void CodeStubInterfaceDescriptor::Initialize(
-    CodeStub::Major major, CallInterfaceDescriptor* call_descriptor,
+    CodeStub::Major major, CallInterfaceDescriptor call_descriptor,
     Register stack_parameter_count, Address deoptimization_handler,
     int hint_stack_parameter_count, StubFunctionMode function_mode,
     HandlerArgumentsMode handler_mode) {
   Initialize(major, call_descriptor, deoptimization_handler,
              hint_stack_parameter_count, function_mode);
   stack_parameter_count_ = stack_parameter_count;
   handler_arguments_mode_ = handler_mode;
 }
 
 
@@ skipping 440 matching lines @@
 void JSEntryStub::FinishCode(Handle<Code> code) {
   Handle<FixedArray> handler_table =
       code->GetIsolate()->factory()->NewFixedArray(1, TENURED);
   handler_table->set(0, Smi::FromInt(handler_offset_));
   code->set_handler_table(*handler_table);
 }
 
 
 void LoadFastElementStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::LoadICCall);
+  LoadDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          FUNCTION_ADDR(KeyedLoadIC_MissFromStubFailure));
 }
 
 
 void LoadDictionaryElementStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::LoadICCall);
+  LoadDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          FUNCTION_ADDR(KeyedLoadIC_MissFromStubFailure));
 }
 
 
 void KeyedLoadGenericStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::LoadICCall);
+  LoadDescriptor call_descriptor(isolate());
   descriptor->Initialize(
       MajorKey(), call_descriptor,
       Runtime::FunctionForId(Runtime::kKeyedGetProperty)->entry);
 }
 
 
 void HandlerStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
   if (kind() == Code::LOAD_IC) {
-    CallInterfaceDescriptor* call_descriptor =
-        isolate()->call_descriptor(CallDescriptorKey::LoadICCall);
+    LoadDescriptor call_descriptor(isolate());
     descriptor->Initialize(MajorKey(), call_descriptor);
   } else {
     DCHECK_EQ(Code::STORE_IC, kind());
-    CallInterfaceDescriptor* call_descriptor =
-        isolate()->call_descriptor(CallDescriptorKey::StoreICCall);
+    StoreDescriptor call_descriptor(isolate());
     descriptor->Initialize(MajorKey(), call_descriptor,
                            FUNCTION_ADDR(StoreIC_MissFromStubFailure));
   }
 }
 
 
 void StoreFastElementStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::StoreICCall);
+  StoreDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          FUNCTION_ADDR(KeyedStoreIC_MissFromStubFailure));
 }
 
 
 void ElementsTransitionAndStoreStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor = isolate()->call_descriptor(
-      CallDescriptorKey::ElementTransitionAndStoreCall);
+  ElementTransitionAndStoreDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          FUNCTION_ADDR(ElementsTransitionAndStoreIC_Miss));
 }
 
 
 void InstanceofStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::InstanceofCall);
+  InstanceofDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor);
 }
 
 
 static void InitializeVectorLoadStub(Isolate* isolate,
                                      CodeStubInterfaceDescriptor* descriptor,
                                      CodeStub::Major major,
                                      Address deoptimization_handler) {
   DCHECK(FLAG_vector_ics);
-  CallInterfaceDescriptor* call_descriptor =
-      isolate->call_descriptor(CallDescriptorKey::VectorLoadICCall);
+  VectorLoadICDescriptor call_descriptor(isolate);
   descriptor->Initialize(major, call_descriptor, deoptimization_handler);
 }
 
 
 void VectorLoadStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
   InitializeVectorLoadStub(isolate(), descriptor, MajorKey(),
                            FUNCTION_ADDR(VectorLoadIC_MissFromStubFailure));
 }
 
 
 void VectorKeyedLoadStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
   InitializeVectorLoadStub(
       isolate(), descriptor, MajorKey(),
       FUNCTION_ADDR(VectorKeyedLoadIC_MissFromStubFailure));
 }
 
 
 void FastNewClosureStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::FastNewClosureCall);
+  FastNewClosureDescriptor call_descriptor(isolate());
   descriptor->Initialize(
       MajorKey(), call_descriptor,
       Runtime::FunctionForId(Runtime::kNewClosureFromStubFailure)->entry);
 }
 
 
 void FastNewContextStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::FastNewContextCall);
+  FastNewContextDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor);
 }
 
 
 void ToNumberStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::ToNumberCall);
+  ToNumberDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor);
 }
 
 
 void NumberToStringStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::NumberToStringCall);
+  NumberToStringDescriptor call_descriptor(isolate());
   descriptor->Initialize(
       MajorKey(), call_descriptor,
       Runtime::FunctionForId(Runtime::kNumberToStringRT)->entry);
 }
 
 
 void FastCloneShallowArrayStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::FastCloneShallowArrayCall);
+  FastCloneShallowArrayDescriptor call_descriptor(isolate());
   descriptor->Initialize(
       MajorKey(), call_descriptor,
       Runtime::FunctionForId(Runtime::kCreateArrayLiteralStubBailout)->entry);
 }
 
 
 void FastCloneShallowObjectStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::FastCloneShallowObjectCall);
+  FastCloneShallowObjectDescriptor call_descriptor(isolate());
   descriptor->Initialize(
       MajorKey(), call_descriptor,
       Runtime::FunctionForId(Runtime::kCreateObjectLiteral)->entry);
 }
 
 
 void CreateAllocationSiteStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::CreateAllocationSiteCall);
+  CreateAllocationSiteDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor);
 }
 
 
 void CallFunctionStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::CallFunctionCall);
+  CallFunctionDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor);
 }
 
 
 void CallConstructStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::CallConstructCall);
+  CallConstructDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor);
 }
 
 
 void RegExpConstructResultStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::RegExpConstructResultCall);
+  RegExpConstructResultDescriptor call_descriptor(isolate());
   descriptor->Initialize(
       MajorKey(), call_descriptor,
       Runtime::FunctionForId(Runtime::kRegExpConstructResult)->entry);
 }
 
 
 void TransitionElementsKindStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::TransitionElementsKindCall);
+  TransitionElementsKindDescriptor call_descriptor(isolate());
   descriptor->Initialize(
       MajorKey(), call_descriptor,
       Runtime::FunctionForId(Runtime::kTransitionElementsKind)->entry);
 }
 
 
 void CompareNilICStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::CompareNilCall);
+  CompareNilDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          FUNCTION_ADDR(CompareNilIC_Miss));
   descriptor->SetMissHandler(
       ExternalReference(IC_Utility(IC::kCompareNilIC_Miss), isolate()));
 }
 
 void ToBooleanStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::ToBooleanCall);
+  ToBooleanDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          FUNCTION_ADDR(ToBooleanIC_Miss));
   descriptor->SetMissHandler(
       ExternalReference(IC_Utility(IC::kToBooleanIC_Miss), isolate()));
 }
 
 
 void BinaryOpICStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::BinaryOpCall);
+  BinaryOpDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          FUNCTION_ADDR(BinaryOpIC_Miss));
   descriptor->SetMissHandler(
       ExternalReference(IC_Utility(IC::kBinaryOpIC_Miss), isolate()));
 }
 
 
 void BinaryOpWithAllocationSiteStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor = isolate()->call_descriptor(
-      CallDescriptorKey::BinaryOpWithAllocationSiteCall);
+  BinaryOpWithAllocationSiteDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          FUNCTION_ADDR(BinaryOpIC_MissWithAllocationSite));
 }
 
 
 void StringAddStub::InitializeInterfaceDescriptor(
     CodeStubInterfaceDescriptor* descriptor) {
-  CallInterfaceDescriptor* call_descriptor =
-      isolate()->call_descriptor(CallDescriptorKey::StringAddCall);
+  StringAddDescriptor call_descriptor(isolate());
   descriptor->Initialize(MajorKey(), call_descriptor,
                          Runtime::FunctionForId(Runtime::kStringAdd)->entry);
 }
 
 
 void LoadDictionaryElementPlatformStub::Generate(MacroAssembler* masm) {
   ElementHandlerCompiler::GenerateLoadDictionaryElement(masm);
 }
 
 
@@ skipping 334 matching lines @@
   InstallDescriptor(isolate, &stub3);
 }
 
 InternalArrayConstructorStub::InternalArrayConstructorStub(
     Isolate* isolate) : PlatformCodeStub(isolate) {
   InternalArrayConstructorStubBase::GenerateStubsAheadOfTime(isolate);
 }
 
 
 } }  // namespace v8::internal