[stubs] Call interface descriptors cleanup.

src/interface-descriptors.h

 // 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.
 
 #ifndef V8_CALL_INTERFACE_DESCRIPTOR_H_
 #define V8_CALL_INTERFACE_DESCRIPTOR_H_
 
 #include <memory>
 
 #include "src/assembler.h"
@@ skipping 267 matching lines @@
   DECLARE_DESCRIPTOR_WITH_BASE(name, base)                                  \
  protected:                                                                 \
   FunctionType* BuildCallInterfaceDescriptorFunctionType(                   \
       Isolate* isolate, int register_param_count) override {                \
     return BuildCallInterfaceDescriptorFunctionTypeWithArg(                 \
         isolate, register_param_count, arg);                                \
   }                                                                         \
                                                                             \
  public:
 
+#define DEFINE_PARAMETERS(...)                          \
+  enum ParameterIndices {                               \
+    __VA_ARGS__,                                        \
+                                                        \
+    kParameterCount,                                    \
+    kContext = kParameterCount /* implicit parameter */ \
+  };
+
 class VoidDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(VoidDescriptor, CallInterfaceDescriptor)
 };
 
 class ContextOnlyDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(ContextOnlyDescriptor, CallInterfaceDescriptor)
 };
 
@@ skipping 60 matching lines @@
 class OnStackWith7ArgsDescriptor : public OnStackArgsDescriptorBase {
  public:
   DECLARE_DESCRIPTOR_WITH_BASE_AND_FUNCTION_TYPE_ARG(OnStackWith7ArgsDescriptor,
                                                      OnStackArgsDescriptorBase,
                                                      7)
 };
 
 // LoadDescriptor is used by all stubs that implement Load/KeyedLoad ICs.
 class LoadDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kReceiver, kName, kSlot)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(LoadDescriptor,
                                                CallInterfaceDescriptor)
 
-  enum ParameterIndices { kReceiverIndex, kNameIndex, kSlotIndex };
   static const Register ReceiverRegister();
   static const Register NameRegister();
   static const Register SlotRegister();
 };
 
 class LoadGlobalDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kSlot)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(LoadGlobalDescriptor,
                                                CallInterfaceDescriptor)
 
-  enum ParameterIndices { kSlotIndex };
-
   static const Register SlotRegister() {
     return LoadDescriptor::SlotRegister();
   }
 };
 
 class StoreDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kReceiver, kName, kValue, kSlot)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreDescriptor,
                                                CallInterfaceDescriptor)
 
-  enum ParameterIndices { kReceiverIndex, kNameIndex, kValueIndex, kSlotIndex };
-
   static const Register ReceiverRegister();
   static const Register NameRegister();
   static const Register ValueRegister();
   static const Register SlotRegister();
 };
 
 
 class StoreTransitionDescriptor : public StoreDescriptor {
  public:
+  DEFINE_PARAMETERS(kReceiver, kName, kValue, kMap)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreTransitionDescriptor,
                                                StoreDescriptor)
 
-  // Extends StoreDescriptor with Map parameter.
-  enum ParameterIndices {
-    kReceiverIndex,
-    kNameIndex,
-    kValueIndex,
-    kMapIndex,
-    kParameterCount
-  };
-
   static const Register MapRegister();
 };
 
 
 class VectorStoreTransitionDescriptor : public StoreDescriptor {
  public:
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(VectorStoreTransitionDescriptor,
                                                StoreDescriptor)
 
+  // TODO(ishell): use DEFINE_PARAMETERS macro here
   // Extends StoreDescriptor with Map parameter.
   enum ParameterIndices {
-    kReceiverIndex = 0,
-    kNameIndex = 1,
-    kValueIndex = 2,
+    kReceiver = 0,
+    kName = 1,
+    kValue = 2,
 
-    kMapIndex = 3,
+    kMap = 3,
 
-    kSlotIndex = 4,  // not present on ia32.
-    kVirtualSlotVectorIndex = 4,
+    kSlot = 4,  // not present on ia32.
+    kVirtualSlotVector = 4,
 
-    kVectorIndex = 5
+    kVector = 5
   };
 
   static const Register MapRegister();
   static const Register SlotRegister();
   static const Register VectorRegister();
 };
 
 class StoreWithVectorDescriptor : public StoreDescriptor {
  public:
+  DEFINE_PARAMETERS(kReceiver, kName, kValue, kSlot, kVector)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreWithVectorDescriptor,
                                                StoreDescriptor)
 
-  enum ParameterIndices {
-    kReceiverIndex,
-    kNameIndex,
-    kValueIndex,
-    kSlotIndex,
-    kVectorIndex
-  };
-
   static const Register VectorRegister();
 };
 
-
 class LoadWithVectorDescriptor : public LoadDescriptor {
  public:
+  DEFINE_PARAMETERS(kReceiver, kName, kSlot, kVector)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(LoadWithVectorDescriptor,
                                                LoadDescriptor)
 
-  enum ParameterIndices {
-    kReceiverIndex,
-    kNameIndex,
-    kSlotIndex,
-    kVectorIndex
-  };
-
   static const Register VectorRegister();
 };
 
 class LoadGlobalWithVectorDescriptor : public LoadGlobalDescriptor {
  public:
+  DEFINE_PARAMETERS(kSlot, kVector)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(LoadGlobalWithVectorDescriptor,
                                                LoadGlobalDescriptor)
 
-  enum ParameterIndices { kSlotIndex, kVectorIndex };
-
   static const Register VectorRegister() {
     return LoadWithVectorDescriptor::VectorRegister();
   }
 };
 
 class FastNewClosureDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(FastNewClosureDescriptor, CallInterfaceDescriptor)
 };
 
 class FastNewFunctionContextDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction)
   DECLARE_DESCRIPTOR(FastNewFunctionContextDescriptor, CallInterfaceDescriptor)
-  enum ParameterIndices { kFunctionIndex, kContextIndex };
 };
 
 class FastNewObjectDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(FastNewObjectDescriptor, CallInterfaceDescriptor)
 };
 
 class FastNewRestParameterDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(FastNewRestParameterDescriptor, CallInterfaceDescriptor)
 };
 
 class FastNewSloppyArgumentsDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(FastNewSloppyArgumentsDescriptor,
                      CallInterfaceDescriptor)
 };
 
 class FastNewStrictArgumentsDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(FastNewStrictArgumentsDescriptor,
                      CallInterfaceDescriptor)
 };
 
 class TypeConversionDescriptor final : public CallInterfaceDescriptor {
  public:
-  enum ParameterIndices { kArgumentIndex };
-
+  DEFINE_PARAMETERS(kArgument)
   DECLARE_DESCRIPTOR(TypeConversionDescriptor, CallInterfaceDescriptor)
 
   static const Register ArgumentRegister();
 };
 
 class HasPropertyDescriptor final : public CallInterfaceDescriptor {
  public:
-  enum ParameterIndices { kKeyIndex, kObjectIndex };
-
-  DECLARE_DEFAULT_DESCRIPTOR(HasPropertyDescriptor, CallInterfaceDescriptor, 2)
+  DEFINE_PARAMETERS(kKey, kObject)
+  DECLARE_DEFAULT_DESCRIPTOR(HasPropertyDescriptor, CallInterfaceDescriptor,
+                             kParameterCount)
 };
 
 class ForInFilterDescriptor final : public CallInterfaceDescriptor {
  public:
-  enum ParameterIndices { kKeyIndex, kObjectIndex };
-
-  DECLARE_DEFAULT_DESCRIPTOR(ForInFilterDescriptor, CallInterfaceDescriptor, 2)
+  DEFINE_PARAMETERS(kKey, kObject)
+  DECLARE_DEFAULT_DESCRIPTOR(ForInFilterDescriptor, CallInterfaceDescriptor,
+                             kParameterCount)
 };
 
 class GetPropertyDescriptor final : public CallInterfaceDescriptor {
  public:
-  enum ParameterIndices { kObjectIndex, kKeyIndex };
-
-  DECLARE_DEFAULT_DESCRIPTOR(GetPropertyDescriptor, CallInterfaceDescriptor, 2)
+  DEFINE_PARAMETERS(kObject, kKey)
+  DECLARE_DEFAULT_DESCRIPTOR(GetPropertyDescriptor, CallInterfaceDescriptor,
+                             kParameterCount)
 };
 
 class TypeofDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kObject)
   DECLARE_DESCRIPTOR(TypeofDescriptor, CallInterfaceDescriptor)
 };
 
 
 class FastCloneRegExpDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kClosure, kLiteralIndex, kPattern, kFlags)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(FastCloneRegExpDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 
 class FastCloneShallowArrayDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kClosure, kLiteralIndex, kConstantElements)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(FastCloneShallowArrayDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 
 class FastCloneShallowObjectDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(FastCloneShallowObjectDescriptor, CallInterfaceDescriptor)
 };
 
 
 class CreateAllocationSiteDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kVector, kSlot)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(CreateAllocationSiteDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 
 class CreateWeakCellDescriptor : public CallInterfaceDescriptor {
  public:
-  enum ParameterIndices {
-    kVectorIndex,
-    kSlotIndex,
-    kValueIndex,
-    kParameterCount
-  };
-
+  DEFINE_PARAMETERS(kVector, kSlot, kValue)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(CreateWeakCellDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 
 class CallTrampolineDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kActualArgumentsCount)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(CallTrampolineDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 
 class ConstructStubDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kNewTarget, kActualArgumentsCount,
+                    kAllocationSite)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(ConstructStubDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 
 class ConstructTrampolineDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kNewTarget, kActualArgumentsCount)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(ConstructTrampolineDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 
 class CallFunctionDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(CallFunctionDescriptor, CallInterfaceDescriptor)
 };
 
 
 class CallFunctionWithFeedbackDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kSlot)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(
       CallFunctionWithFeedbackDescriptor, CallInterfaceDescriptor)
 };
 
 
 class CallFunctionWithFeedbackAndVectorDescriptor
     : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kSlot, kVector)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(
       CallFunctionWithFeedbackAndVectorDescriptor, CallInterfaceDescriptor)
 };
 
 
 class CallConstructDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(CallConstructDescriptor, CallInterfaceDescriptor)
 };
 
 
 class RegExpConstructResultDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kLength, kIndex, kInput)
   DECLARE_DESCRIPTOR(RegExpConstructResultDescriptor, CallInterfaceDescriptor)
 };
 
 
 class StoreGlobalViaContextDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kSlot, kValue)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(StoreGlobalViaContextDescriptor,
                                                CallInterfaceDescriptor)
 
   static const Register SlotRegister();
   static const Register ValueRegister();
 };
 
 
 class TransitionElementsKindDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kObject, kMap)
   DECLARE_DESCRIPTOR(TransitionElementsKindDescriptor, CallInterfaceDescriptor)
 };
 
 
 class AllocateHeapNumberDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(AllocateHeapNumberDescriptor, CallInterfaceDescriptor)
 };
 
 #define SIMD128_ALLOC_DESC(TYPE, Type, type, lane_count, lane_type)         \
   class Allocate##Type##Descriptor : public CallInterfaceDescriptor {       \
    public:                                                                  \
     DECLARE_DESCRIPTOR(Allocate##Type##Descriptor, CallInterfaceDescriptor) \
   };
 SIMD128_TYPES(SIMD128_ALLOC_DESC)
 #undef SIMD128_ALLOC_DESC
 
 class ArrayNoArgumentConstructorDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kAllocationSite, kActualArgumentsCount,
+                    kFunctionParameter)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(
       ArrayNoArgumentConstructorDescriptor, CallInterfaceDescriptor)
-  enum ParameterIndices {
-    kFunctionIndex,
-    kAllocationSiteIndex,
-    kArgumentCountIndex,
-    kFunctionParameterIndex,
-    kContextIndex
-  };
 };
 
 class ArraySingleArgumentConstructorDescriptor
     : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kAllocationSite, kActualArgumentsCount,
+                    kFunctionParameter, kArraySizeSmiParameter)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(
       ArraySingleArgumentConstructorDescriptor, CallInterfaceDescriptor)
-  enum ParameterIndices {
-    kFunctionIndex,
-    kAllocationSiteIndex,
-    kArgumentCountIndex,
-    kFunctionParameterIndex,
-    kArraySizeSmiParameterIndex,
-    kContextIndex
-  };
 };
 
 class ArrayNArgumentsConstructorDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kAllocationSite, kActualArgumentsCount)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(
       ArrayNArgumentsConstructorDescriptor, CallInterfaceDescriptor)
-  enum ParameterIndices {
-    kFunctionIndex,
-    kAllocationSiteIndex,
-    kArgumentCountIndex,
-    kContextIndex
-  };
 };
 
 
 class CompareDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kLeft, kRight)
   DECLARE_DESCRIPTOR(CompareDescriptor, CallInterfaceDescriptor)
 };
 
 
 class BinaryOpDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kLeft, kRight)
   DECLARE_DESCRIPTOR(BinaryOpDescriptor, CallInterfaceDescriptor)
 };
 
 
 class BinaryOpWithAllocationSiteDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kAllocationSite, kLeft, kRight)
   DECLARE_DESCRIPTOR(BinaryOpWithAllocationSiteDescriptor,
                      CallInterfaceDescriptor)
 };
 
 class CountOpDescriptor final : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(CountOpDescriptor, CallInterfaceDescriptor)
 };
 
 class StringAddDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kLeft, kRight)
   DECLARE_DESCRIPTOR(StringAddDescriptor, CallInterfaceDescriptor)
 };
 
 
 class StringCompareDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kLeft, kRight)
   DECLARE_DESCRIPTOR(StringCompareDescriptor, CallInterfaceDescriptor)
 
-  enum ParameterIndices { kLeftIndex, kRightIndex, kParameterCount };
   static const Register LeftRegister();
   static const Register RightRegister();
 };
 
-
+// TODO(ishell): not used, remove.
 class KeyedDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(KeyedDescriptor, CallInterfaceDescriptor)
 };
 
-
+// TODO(ishell): not used, remove
 class NamedDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(NamedDescriptor, CallInterfaceDescriptor)
 };
 
-
+// TODO(ishell): not used, remove.
 class CallHandlerDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(CallHandlerDescriptor, CallInterfaceDescriptor)
 };
 
 
 class ArgumentAdaptorDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kNewTarget, kActualArgumentsCount,
+                    kExpectedArgumentsCount)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(ArgumentAdaptorDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 // The ApiCallback*Descriptors have a lot of boilerplate. The superclass
 // ApiCallbackDescriptorBase contains all the logic, and the
 // ApiCallbackWith*ArgsDescriptor merely instantiate these with a
 // parameter for the number of args.
 //
 // The base class is not meant to be instantiated directly and has no
 // public constructors to ensure this is so.
 //
 // The simplest usage for all the ApiCallback*Descriptors is probably
 //   ApiCallbackDescriptorBase::ForArgs(isolate, argc)
 //
 class ApiCallbackDescriptorBase : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kFunction, kCallData, kHolder, kApiFunctionAddress)
   static CallInterfaceDescriptor ForArgs(Isolate* isolate, int argc);
 
  protected:
   ApiCallbackDescriptorBase(Isolate* isolate, CallDescriptors::Key key)
       : CallInterfaceDescriptor(isolate, key) {}
   void InitializePlatformSpecific(CallInterfaceDescriptorData* data) override;
   FunctionType* BuildCallInterfaceDescriptorFunctionTypeWithArg(
       Isolate* isolate, int parameter_count, int argc);
 };
 
@@ skipping 41 matching lines @@
 
 class ApiCallbackWith7ArgsDescriptor : public ApiCallbackDescriptorBase {
  public:
   DECLARE_DESCRIPTOR_WITH_BASE_AND_FUNCTION_TYPE_ARG(
       ApiCallbackWith7ArgsDescriptor, ApiCallbackDescriptorBase, 7)
 };
 
 
 class ApiGetterDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kReceiver, kHolder, kCallback)
   DECLARE_DESCRIPTOR(ApiGetterDescriptor, CallInterfaceDescriptor)
 
   static const Register ReceiverRegister();
   static const Register HolderRegister();
   static const Register CallbackRegister();
 };
 
 class MathPowTaggedDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kExponent)
   DECLARE_DESCRIPTOR(MathPowTaggedDescriptor, CallInterfaceDescriptor)
 
   static const Register exponent();
 };
 
 class MathPowIntegerDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kExponent)
   DECLARE_DESCRIPTOR(MathPowIntegerDescriptor, CallInterfaceDescriptor)
 
   static const Register exponent();
 };
 
 class VarArgFunctionDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kActualArgumentsCount)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(VarArgFunctionDescriptor,
                                                CallInterfaceDescriptor)
 };
 
 class GrowArrayElementsDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kObject, kKey)
   DECLARE_DESCRIPTOR(GrowArrayElementsDescriptor, CallInterfaceDescriptor)
 
-  enum RegisterInfo { kObjectIndex, kKeyIndex };
   static const Register ObjectRegister();
   static const Register KeyRegister();
 };
 
 class InterpreterDispatchDescriptor : public CallInterfaceDescriptor {
  public:
+  DEFINE_PARAMETERS(kAccumulator, kBytecodeOffset, kBytecodeArray,
+                    kDispatchTable)
   DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE(InterpreterDispatchDescriptor,
                                                CallInterfaceDescriptor)
-
-  static const int kAccumulatorParameter = 0;
-  static const int kBytecodeOffsetParameter = 1;
-  static const int kBytecodeArrayParameter = 2;
-  static const int kDispatchTableParameter = 3;
 };
 
 class InterpreterPushArgsAndCallDescriptor : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(InterpreterPushArgsAndCallDescriptor,
                      CallInterfaceDescriptor)
 };
 
 
 class InterpreterPushArgsAndConstructDescriptor
@@ skipping 11 matching lines @@
 
 class ResumeGeneratorDescriptor final : public CallInterfaceDescriptor {
  public:
   DECLARE_DESCRIPTOR(ResumeGeneratorDescriptor, CallInterfaceDescriptor)
 };
 
 #undef DECLARE_DESCRIPTOR_WITH_BASE
 #undef DECLARE_DESCRIPTOR
 #undef DECLARE_DESCRIPTOR_WITH_CUSTOM_FUNCTION_TYPE
 #undef DECLARE_DESCRIPTOR_WITH_BASE_AND_FUNCTION_TYPE_ARG
+#undef DEFINE_PARAMETERS
 
 // We define the association between CallDescriptors::Key and the specialized
 // descriptor here to reduce boilerplate and mistakes.
 #define DEF_KEY(name) \
   CallDescriptors::Key name##Descriptor::key() { return CallDescriptors::name; }
 INTERFACE_DESCRIPTOR_LIST(DEF_KEY)
 #undef DEF_KEY
 }  // namespace internal
 }  // namespace v8
 
 
 #if V8_TARGET_ARCH_ARM64
 #include "src/arm64/interface-descriptors-arm64.h"
 #elif V8_TARGET_ARCH_ARM
 #include "src/arm/interface-descriptors-arm.h"
 #endif
 
 #endif  // V8_CALL_INTERFACE_DESCRIPTOR_H_