Clean up code stubs and ensure distinct major keys.

src/code-stubs.h

 // 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.
 
 #ifndef V8_CODE_STUBS_H_
 #define V8_CODE_STUBS_H_
 
 #include "src/allocation.h"
 #include "src/assembler.h"
 #include "src/codegen.h"
 #include "src/globals.h"
 #include "src/ic/ic.h"
 #include "src/interface-descriptors.h"
 #include "src/macro-assembler.h"
 #include "src/ostreams.h"
 
 namespace v8 {
 namespace internal {
 
 // List of code stubs used on all platforms.
 #define CODE_STUB_LIST_ALL_PLATFORMS(V)     \
+  /* PlatformCodeStubs */                   \
+  V(ArgumentsAccess)                        \
+  V(ArrayConstructor)                       \
+  V(BinaryOpICWithAllocationSite)           \
+  V(CallApiFunction)                        \
+  V(CallApiGetter)                          \
+  V(CallConstruct)                          \
   V(CallFunction)                           \
-  V(CallConstruct)                          \
-  V(BinaryOpIC)                             \
-  V(BinaryOpICWithAllocationSite)           \
-  V(BinaryOpWithAllocationSite)             \
-  V(StringAdd)                              \
-  V(SubString)                              \
-  V(StringCompare)                          \
-  V(Compare)                                \
-  V(CompareIC)                              \
-  V(CompareNilIC)                           \
-  V(MathPow)                                \
   V(CallIC)                                 \
   V(CallIC_Array)                           \
+  V(CEntry)                                 \
+  V(CompareIC)                              \
+  V(DoubleToI)                              \
   V(FunctionPrototype)                      \
+  V(Instanceof)                             \
+  V(InternalArrayConstructor)               \
+  V(JSEntry)                                \
+  V(KeyedLoadICTrampoline)                  \
+  V(LoadICTrampoline)                       \
+  V(MathPow)                                \
+  V(ProfileEntryHook)                       \
   V(RecordWrite)                            \
+  V(RegExpExec)                             \
+  V(StoreArrayLiteralElement)               \
   V(StoreBufferOverflow)                    \
-  V(RegExpExec)                             \
-  V(Instanceof)                             \
-  V(ConvertToDouble)                        \
-  V(WriteInt32ToHeapNumber)                 \
-  V(StackCheck)                             \
-  V(Interrupt)                              \
+  V(StoreElement)                           \
+  V(StringCompare)                          \
+  V(StubFailureTrampoline)                  \
+  V(SubString)                              \
+  /* HydrogenCodeStubs */                   \
+  V(ArrayNArgumentsConstructor)             \
+  V(ArrayNoArgumentConstructor)             \
+  V(ArraySingleArgumentConstructor)         \
+  V(BinaryOpIC)                             \
+  V(BinaryOpWithAllocationSite)             \
+  V(CompareNilIC)                           \
+  V(CreateAllocationSite)                   \
+  V(ElementsTransitionAndStore)             \
+  V(FastCloneShallowArray)                  \
+  V(FastCloneShallowObject)                 \
   V(FastNewClosure)                         \
   V(FastNewContext)                         \
-  V(FastCloneShallowArray)                  \
-  V(FastCloneShallowObject)                 \
-  V(CreateAllocationSite)                   \
+  V(InternalArrayNArgumentsConstructor)     \
+  V(InternalArrayNoArgumentConstructor)     \
+  V(InternalArraySingleArgumentConstructor) \
+  V(KeyedLoadGeneric)                       \
+  V(LoadDictionaryElement)                  \
+  V(LoadFastElement)                        \
+  V(NameDictionaryLookup)                   \
+  V(NumberToString)                         \
+  V(RegExpConstructResult)                  \
+  V(StoreFastElement)                       \
+  V(StringAdd)                              \
   V(ToBoolean)                              \
   V(ToNumber)                               \
-  V(ArgumentsAccess)                        \
-  V(RegExpConstructResult)                  \
-  V(NumberToString)                         \
-  V(DoubleToI)                              \
-  V(CEntry)                                 \
-  V(JSEntry)                                \
-  V(LoadElement)                            \
-  V(KeyedLoadGeneric)                       \
-  V(ArrayNoArgumentConstructor)             \
-  V(ArraySingleArgumentConstructor)         \
-  V(ArrayNArgumentsConstructor)             \
-  V(InternalArrayNoArgumentConstructor)     \
-  V(InternalArraySingleArgumentConstructor) \
-  V(InternalArrayNArgumentsConstructor)     \
-  V(StoreElement)                           \
-  V(DebuggerStatement)                      \
-  V(NameDictionaryLookup)                   \
-  V(ElementsTransitionAndStore)             \
   V(TransitionElementsKind)                 \
-  V(StoreArrayLiteralElement)               \
-  V(StubFailureTrampoline)                  \
-  V(ArrayConstructor)                       \
-  V(InternalArrayConstructor)               \
-  V(ProfileEntryHook)                       \
-  V(StoreGlobal)                            \
-  V(CallApiFunction)                        \
-  V(CallApiGetter)                          \
-  V(LoadICTrampoline)                       \
+  V(VectorKeyedLoad)                        \
   V(VectorLoad)                             \
-  V(KeyedLoadICTrampoline)                  \
-  V(VectorKeyedLoad)                        \
   /* IC Handler stubs */                    \
+  V(LoadConstant)                           \
   V(LoadField)                              \
   V(StoreField)                             \
-  V(LoadConstant)                           \
+  V(StoreGlobal)                            \
   V(StringLength)
 
 // List of code stubs only used on ARM 32 bits platforms.
 #if V8_TARGET_ARCH_ARM
-#define CODE_STUB_LIST_ARM(V)  \
-  V(GetProperty)               \
-  V(SetProperty)               \
-  V(InvokeBuiltin)             \
-  V(DirectCEntry)
+#define CODE_STUB_LIST_ARM(V) \
+  V(DirectCEntry)             \
+  V(WriteInt32ToHeapNumber)
+
 #else
 #define CODE_STUB_LIST_ARM(V)
 #endif
 
 // List of code stubs only used on ARM 64 bits platforms.
 #if V8_TARGET_ARCH_ARM64
-#define CODE_STUB_LIST_ARM64(V)  \
-  V(GetProperty)               \
-  V(SetProperty)               \
-  V(InvokeBuiltin)             \
-  V(DirectCEntry)              \
-  V(StoreRegistersState)       \
-  V(RestoreRegistersState)
+#define CODE_STUB_LIST_ARM64(V) \
+  V(DirectCEntry)               \
+  V(RestoreRegistersState)      \
+  V(StoreRegistersState)
+
 #else
 #define CODE_STUB_LIST_ARM64(V)
 #endif
 
 // List of code stubs only used on MIPS platforms.
 #if V8_TARGET_ARCH_MIPS
 #define CODE_STUB_LIST_MIPS(V)  \
   V(RegExpCEntry)               \
   V(DirectCEntry)               \
   V(StoreRegistersState)        \
@@ skipping 400 matching lines @@
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate) {
     ToNumberStub stub(isolate);
     stub.InitializeInterfaceDescriptor(
         isolate->code_stub_interface_descriptor(CodeStub::ToNumber));
   }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return ToNumber; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(ToNumberStub);
 };
 
 
 class NumberToStringStub FINAL : public HydrogenCodeStub {
  public:
   explicit NumberToStringStub(Isolate* isolate) : HydrogenCodeStub(isolate) {}
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   // Parameters accessed via CodeStubGraphBuilder::GetParameter()
   static const int kNumber = 0;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return NumberToString; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(NumberToStringStub);
 };
 
 
 class FastNewClosureStub : public HydrogenCodeStub {
  public:
   FastNewClosureStub(Isolate* isolate, StrictMode strict_mode,
                      bool is_generator)
       : HydrogenCodeStub(isolate) {
     set_sub_minor_key(StrictModeBits::encode(strict_mode) |
                       IsGeneratorBits::encode(is_generator));
   }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   StrictMode strict_mode() const {
     return StrictModeBits::decode(sub_minor_key());
   }
 
   bool is_generator() const { return IsGeneratorBits::decode(sub_minor_key()); }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return FastNewClosure; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class StrictModeBits : public BitField<StrictMode, 0, 1> {};
   class IsGeneratorBits : public BitField<bool, 1, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(FastNewClosureStub);
 };
 
 
 class FastNewContextStub FINAL : public HydrogenCodeStub {
  public:
@@ skipping 10 matching lines @@
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   int slots() const { return SlotsBits::decode(sub_minor_key()); }
 
   // Parameters accessed via CodeStubGraphBuilder::GetParameter()
   static const int kFunction = 0;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return FastNewContext; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class SlotsBits : public BitField<int, 0, 8> {};
 
   DISALLOW_COPY_AND_ASSIGN(FastNewContextStub);
 };
 
 
 class FastCloneShallowArrayStub : public HydrogenCodeStub {
  public:
   FastCloneShallowArrayStub(Isolate* isolate,
                             AllocationSiteMode allocation_site_mode)
       : HydrogenCodeStub(isolate) {
     set_sub_minor_key(AllocationSiteModeBits::encode(allocation_site_mode));
   }
 
   AllocationSiteMode allocation_site_mode() const {
     return AllocationSiteModeBits::decode(sub_minor_key());
   }
 
   virtual Handle<Code> GenerateCode();
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return FastCloneShallowArray; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class AllocationSiteModeBits: public BitField<AllocationSiteMode, 0, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(FastCloneShallowArrayStub);
 };
 
 
 class FastCloneShallowObjectStub : public HydrogenCodeStub {
  public:
   // Maximum number of properties in copied object.
   static const int kMaximumClonedProperties = 6;
 
   FastCloneShallowObjectStub(Isolate* isolate, int length)
       : HydrogenCodeStub(isolate) {
     DCHECK_GE(length, 0);
     DCHECK_LE(length, kMaximumClonedProperties);
     set_sub_minor_key(LengthBits::encode(length));
   }
 
   int length() const { return LengthBits::decode(sub_minor_key()); }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return FastCloneShallowObject; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class LengthBits : public BitField<int, 0, 4> {};
 
   DISALLOW_COPY_AND_ASSIGN(FastCloneShallowObjectStub);
 };
 
 
 class CreateAllocationSiteStub : public HydrogenCodeStub {
  public:
   explicit CreateAllocationSiteStub(Isolate* isolate)
       : HydrogenCodeStub(isolate) { }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   static void GenerateAheadOfTime(Isolate* isolate);
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return CreateAllocationSite; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(CreateAllocationSiteStub);
 };
 
 
 class InstanceofStub: public PlatformCodeStub {
  public:
   enum Flags {
     kNoFlags = 0,
     kArgsInRegisters = 1 << 0,
     kCallSiteInlineCheck = 1 << 1,
     kReturnTrueFalseObject = 1 << 2
   };
 
   InstanceofStub(Isolate* isolate, Flags flags) : PlatformCodeStub(isolate) {
     minor_key_ = FlagBits::encode(flags);
   }
 
   void Generate(MacroAssembler* masm);
 
   static Register left() { return InstanceofDescriptor::left(); }
   static Register right() { return InstanceofDescriptor::right(); }
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return Instanceof; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   Flags flags() const { return FlagBits::decode(minor_key_); }
 
   bool HasArgsInRegisters() const { return (flags() & kArgsInRegisters) != 0; }
 
   bool HasCallSiteInlineCheck() const {
     return (flags() & kCallSiteInlineCheck) != 0;
   }
 
   bool ReturnTrueFalseObject() const {
@@ skipping 18 matching lines @@
 class ArrayConstructorStub: public PlatformCodeStub {
  public:
   enum ArgumentCountKey { ANY, NONE, ONE, MORE_THAN_ONE };
   ArrayConstructorStub(Isolate* isolate, int argument_count);
 
   explicit ArrayConstructorStub(Isolate* isolate);
 
   void Generate(MacroAssembler* masm);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return ArrayConstructor; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   ArgumentCountKey argument_count() const {
     return ArgumentCountBits::decode(minor_key_);
   }
 
   void GenerateDispatchToArrayStub(MacroAssembler* masm,
                                    AllocationSiteOverrideMode mode);
 
   virtual void PrintName(OStream& os) const OVERRIDE;  // NOLINT
 
   class ArgumentCountBits : public BitField<ArgumentCountKey, 0, 2> {};
 
   DISALLOW_COPY_AND_ASSIGN(ArrayConstructorStub);
 };
 
 
 class InternalArrayConstructorStub: public PlatformCodeStub {
  public:
   explicit InternalArrayConstructorStub(Isolate* isolate);
 
   void Generate(MacroAssembler* masm);
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return InternalArrayConstructor;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   void GenerateCase(MacroAssembler* masm, ElementsKind kind);
 
   DISALLOW_COPY_AND_ASSIGN(InternalArrayConstructorStub);
 };
 
 
 class MathPowStub: public PlatformCodeStub {
  public:
   enum ExponentType { INTEGER, DOUBLE, TAGGED, ON_STACK };
 
   MathPowStub(Isolate* isolate, ExponentType exponent_type)
       : PlatformCodeStub(isolate) {
     minor_key_ = ExponentTypeBits::encode(exponent_type);
   }
 
   virtual void Generate(MacroAssembler* masm);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return MathPow; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   ExponentType exponent_type() const {
     return ExponentTypeBits::decode(minor_key_);
   }
 
   class ExponentTypeBits : public BitField<ExponentType, 0, 2> {};
 
   DISALLOW_COPY_AND_ASSIGN(MathPowStub);
 };
 
@@ skipping 26 matching lines @@
   int arg_count() const { return state().arg_count(); }
 
   CallIC::State state() const {
     return CallIC::State(static_cast<ExtraICState>(minor_key_));
   }
 
   // Code generation helpers.
   void GenerateMiss(MacroAssembler* masm, IC::UtilityId id);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return CallIC; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   virtual void PrintState(OStream& os) const OVERRIDE;  // NOLINT
 
   DISALLOW_COPY_AND_ASSIGN(CallICStub);
 };
 
 
 class CallIC_ArrayStub: public CallICStub {
  public:
   CallIC_ArrayStub(Isolate* isolate, const CallIC::State& state_in)
       : CallICStub(isolate, state_in) {}
 
   virtual void Generate(MacroAssembler* masm);
 
   virtual InlineCacheState GetICState() const FINAL OVERRIDE {
     return MONOMORPHIC;
   }
 
  private:
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
+
   virtual void PrintState(OStream& os) const OVERRIDE;  // NOLINT
 
-  virtual Major MajorKey() const OVERRIDE { return CallIC_Array; }
-
   DISALLOW_COPY_AND_ASSIGN(CallIC_ArrayStub);
 };
 
 
 // TODO(verwaest): Translate to hydrogen code stub.
 class FunctionPrototypeStub : public PlatformCodeStub {
  public:
   explicit FunctionPrototypeStub(Isolate* isolate)
       : PlatformCodeStub(isolate) {}
   virtual void Generate(MacroAssembler* masm);
   virtual Code::Kind GetCodeKind() const { return Code::HANDLER; }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return FunctionPrototype; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(FunctionPrototypeStub);
 };
 
 
 class HandlerStub : public HydrogenCodeStub {
  public:
   virtual Code::Kind GetCodeKind() const { return Code::HANDLER; }
   virtual ExtraICState GetExtraICState() const { return kind(); }
   virtual InlineCacheState GetICState() const { return MONOMORPHIC; }
@@ skipping 23 matching lines @@
     int property_index_key = LoadFieldByIndexBits::decode(sub_minor_key());
     return FieldIndex::FromFieldAccessStubKey(property_index_key);
   }
 
  protected:
   explicit LoadFieldStub(Isolate* isolate);
   virtual Code::Kind kind() const { return Code::LOAD_IC; }
   virtual Code::StubType GetStubType() { return Code::FAST; }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return LoadField; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class LoadFieldByIndexBits : public BitField<int, 0, 13> {};
 
   DISALLOW_COPY_AND_ASSIGN(LoadFieldStub);
 };
 
 
 class LoadConstantStub : public HandlerStub {
  public:
   LoadConstantStub(Isolate* isolate, int constant_index)
       : HandlerStub(isolate) {
     set_sub_minor_key(ConstantIndexBits::encode(constant_index));
   }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   int constant_index() const {
     return ConstantIndexBits::decode(sub_minor_key());
   }
 
  protected:
   explicit LoadConstantStub(Isolate* isolate);
   virtual Code::Kind kind() const { return Code::LOAD_IC; }
   virtual Code::StubType GetStubType() { return Code::FAST; }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return LoadConstant; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class ConstantIndexBits : public BitField<int, 0, kSubMinorKeyBits> {};
 
   DISALLOW_COPY_AND_ASSIGN(LoadConstantStub);
 };
 
 
 class StringLengthStub: public HandlerStub {
  public:
   explicit StringLengthStub(Isolate* isolate) : HandlerStub(isolate) {}
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
  protected:
   virtual Code::Kind kind() const { return Code::LOAD_IC; }
   virtual Code::StubType GetStubType() { return Code::FAST; }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return StringLength; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(StringLengthStub);
 };
 
 
 class StoreFieldStub : public HandlerStub {
  public:
   StoreFieldStub(Isolate* isolate, FieldIndex index,
                  Representation representation)
       : HandlerStub(isolate) {
@@ skipping 16 matching lines @@
   }
 
   static void InstallDescriptors(Isolate* isolate);
 
  protected:
   explicit StoreFieldStub(Isolate* isolate);
   virtual Code::Kind kind() const { return Code::STORE_IC; }
   virtual Code::StubType GetStubType() { return Code::FAST; }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return StoreField; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class StoreFieldByIndexBits : public BitField<int, 0, 13> {};
   class RepresentationBits : public BitField<uint8_t, 13, 4> {};
 
   DISALLOW_COPY_AND_ASSIGN(StoreFieldStub);
 };
 
 
 class StoreGlobalStub : public HandlerStub {
  public:
@@ skipping 37 matching lines @@
   Representation representation() {
     return Representation::FromKind(
         RepresentationBits::decode(sub_minor_key()));
   }
 
   void set_representation(Representation r) {
     set_sub_minor_key(RepresentationBits::update(sub_minor_key(), r.kind()));
   }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return StoreGlobal; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class IsConstantBits: public BitField<bool, 0, 1> {};
   class RepresentationBits: public BitField<Representation::Kind, 1, 8> {};
   class CheckGlobalBits: public BitField<bool, 9, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(StoreGlobalStub);
 };
 
 
 class CallApiFunctionStub : public PlatformCodeStub {
  public:
   CallApiFunctionStub(Isolate* isolate,
                       bool is_store,
                       bool call_data_undefined,
                       int argc) : PlatformCodeStub(isolate) {
     minor_key_ = IsStoreBits::encode(is_store) |
                  CallDataUndefinedBits::encode(call_data_undefined) |
                  ArgumentBits::encode(argc);
     DCHECK(!is_store || argc == 1);
   }
 
  private:
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
+
   virtual void Generate(MacroAssembler* masm) OVERRIDE;
-  virtual Major MajorKey() const OVERRIDE { return CallApiFunction; }
 
   bool is_store() const { return IsStoreBits::decode(minor_key_); }
   bool call_data_undefined() const {
     return CallDataUndefinedBits::decode(minor_key_);
   }
   int argc() const { return ArgumentBits::decode(minor_key_); }
 
   class IsStoreBits: public BitField<bool, 0, 1> {};
   class CallDataUndefinedBits: public BitField<bool, 1, 1> {};
   class ArgumentBits: public BitField<int, 2, Code::kArgumentsBits> {};
   STATIC_ASSERT(Code::kArgumentsBits + 2 <= kStubMinorKeyBits);
 
   DISALLOW_COPY_AND_ASSIGN(CallApiFunctionStub);
 };
 
 
 class CallApiGetterStub : public PlatformCodeStub {
  public:
   explicit CallApiGetterStub(Isolate* isolate) : PlatformCodeStub(isolate) {}
 
  private:
   virtual void Generate(MacroAssembler* masm) OVERRIDE;
-  virtual Major MajorKey() const OVERRIDE { return CallApiGetter; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(CallApiGetterStub);
 };
 
 
 class BinaryOpICStub : public HydrogenCodeStub {
  public:
   BinaryOpICStub(Isolate* isolate, Token::Value op,
                  OverwriteMode mode = NO_OVERWRITE)
       : HydrogenCodeStub(isolate, UNINITIALIZED) {
@@ skipping 31 matching lines @@
     return BinaryOpIC::State(isolate(), GetExtraICState());
   }
 
   virtual void PrintState(OStream& os) const FINAL OVERRIDE;  // NOLINT
 
   // Parameters accessed via CodeStubGraphBuilder::GetParameter()
   static const int kLeft = 0;
   static const int kRight = 1;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return BinaryOpIC; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   static void GenerateAheadOfTime(Isolate* isolate,
                                   const BinaryOpIC::State& state);
 
   DISALLOW_COPY_AND_ASSIGN(BinaryOpICStub);
 };
 
 
 // TODO(bmeurer): Merge this into the BinaryOpICStub once we have proper tail
 // call support for stubs in Hydrogen.
@@ skipping 22 matching lines @@
   }
 
   virtual ExtraICState GetExtraICState() const OVERRIDE {
     return static_cast<ExtraICState>(minor_key_);
   }
 
   virtual void Generate(MacroAssembler* masm) OVERRIDE;
 
   virtual void PrintState(OStream& os) const OVERRIDE;  // NOLINT
 
-  virtual Major MajorKey() const OVERRIDE {
-    return BinaryOpICWithAllocationSite;
-  }
+ private:
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
- private:
   BinaryOpIC::State state() const {
     return BinaryOpIC::State(isolate(), static_cast<ExtraICState>(minor_key_));
   }
 
   static void GenerateAheadOfTime(Isolate* isolate,
                                   const BinaryOpIC::State& state);
 
   DISALLOW_COPY_AND_ASSIGN(BinaryOpICWithAllocationSiteStub);
 };
 
@@ skipping 13 matching lines @@
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   virtual Code::Kind GetCodeKind() const FINAL OVERRIDE {
     return Code::STUB;
   }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
-  virtual Major MajorKey() const OVERRIDE {
-    return BinaryOpWithAllocationSite;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   // Parameters accessed via CodeStubGraphBuilder::GetParameter()
   static const int kAllocationSite = 0;
   static const int kLeft = 1;
   static const int kRight = 2;
 };
 
 
 enum StringAddFlags {
   // Omit both parameter checks.
@@ skipping 29 matching lines @@
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   // Parameters accessed via CodeStubGraphBuilder::GetParameter()
   static const int kLeft = 0;
   static const int kRight = 1;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return StringAdd; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class StringAddFlagsBits: public BitField<StringAddFlags, 0, 2> {};
   class PretenureFlagBits: public BitField<PretenureFlag, 2, 1> {};
 
   virtual void PrintBaseName(OStream& os) const OVERRIDE;  // NOLINT
 
   DISALLOW_COPY_AND_ASSIGN(StringAddStub);
 };
 
 
-class ICCompareStub: public PlatformCodeStub {
+class CompareICStub : public PlatformCodeStub {
  public:
-  ICCompareStub(Isolate* isolate, Token::Value op, CompareIC::State left,
+  CompareICStub(Isolate* isolate, Token::Value op, CompareIC::State left,
                 CompareIC::State right, CompareIC::State state)
       : PlatformCodeStub(isolate) {
     DCHECK(Token::IsCompareOp(op));
     minor_key_ = OpBits::encode(op - Token::EQ) | LeftStateBits::encode(left) |
                  RightStateBits::encode(right) | StateBits::encode(state);
   }
 
   virtual void Generate(MacroAssembler* masm);
 
   void set_known_map(Handle<Map> map) { known_map_ = map; }
 
-  explicit ICCompareStub(uint32_t stub_key) : PlatformCodeStub(stub_key) {
+  explicit CompareICStub(uint32_t stub_key) : PlatformCodeStub(stub_key) {
     DCHECK_EQ(MajorKeyFromKey(stub_key), MajorKey());
   }
 
   virtual InlineCacheState GetICState() const;
 
   Token::Value op() const {
     return static_cast<Token::Value>(Token::EQ + OpBits::decode(minor_key_));
   }
 
   CompareIC::State left() const { return LeftStateBits::decode(minor_key_); }
   CompareIC::State right() const { return RightStateBits::decode(minor_key_); }
   CompareIC::State state() const { return StateBits::decode(minor_key_); }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return CompareIC; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   virtual Code::Kind GetCodeKind() const { return Code::COMPARE_IC; }
 
   void GenerateSmis(MacroAssembler* masm);
   void GenerateNumbers(MacroAssembler* masm);
   void GenerateInternalizedStrings(MacroAssembler* masm);
   void GenerateStrings(MacroAssembler* masm);
   void GenerateUniqueNames(MacroAssembler* masm);
   void GenerateObjects(MacroAssembler* masm);
   void GenerateMiss(MacroAssembler* masm);
   void GenerateKnownObjects(MacroAssembler* masm);
   void GenerateGeneric(MacroAssembler* masm);
 
   bool strict() const { return op() == Token::EQ_STRICT; }
   Condition GetCondition() const { return CompareIC::ComputeCondition(op()); }
 
   virtual void AddToSpecialCache(Handle<Code> new_object);
   virtual bool FindCodeInSpecialCache(Code** code_out);
   virtual bool UseSpecialCache() { return state() == CompareIC::KNOWN_OBJECT; }
 
   class OpBits : public BitField<int, 0, 3> {};
   class LeftStateBits : public BitField<CompareIC::State, 3, 4> {};
   class RightStateBits : public BitField<CompareIC::State, 7, 4> {};
   class StateBits : public BitField<CompareIC::State, 11, 4> {};
 
   Handle<Map> known_map_;
 
-  DISALLOW_COPY_AND_ASSIGN(ICCompareStub);
+  DISALLOW_COPY_AND_ASSIGN(CompareICStub);
 };
 
 
 class CompareNilICStub : public HydrogenCodeStub  {
  public:
   Type* GetType(Zone* zone, Handle<Map> map = Handle<Map>());
   Type* GetInputType(Zone* zone, Handle<Map> map);
 
   CompareNilICStub(Isolate* isolate, NilValue nil) : HydrogenCodeStub(isolate) {
     set_sub_minor_key(NilValueBits::encode(nil));
@@ skipping 49 matching lines @@
   virtual void PrintState(OStream& os) const OVERRIDE;     // NOLINT
   virtual void PrintBaseName(OStream& os) const OVERRIDE;  // NOLINT
 
  private:
   CompareNilICStub(Isolate* isolate, NilValue nil,
                    InitializationState init_state)
       : HydrogenCodeStub(isolate, init_state) {
     set_sub_minor_key(NilValueBits::encode(nil));
   }
 
-  virtual Major MajorKey() const OVERRIDE { return CompareNilIC; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   enum CompareNilType {
     UNDEFINED,
     NULL_TYPE,
     MONOMORPHIC_MAP,
     GENERIC,
     NUMBER_OF_TYPES
   };
 
   // At most 6 different types can be distinguished, because the Code object
@@ skipping 36 matching lines @@
 
   void Generate(MacroAssembler* masm);
 
   // The version of this stub that doesn't save doubles is generated ahead of
   // time, so it's OK to call it from other stubs that can't cope with GC during
   // their code generation.  On machines that always have gp registers (x64) we
   // can generate both variants ahead of time.
   static void GenerateAheadOfTime(Isolate* isolate);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return CEntry; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   bool save_doubles() const { return SaveDoublesBits::decode(minor_key_); }
 #ifdef _WIN64
   int result_size() const { return ResultSizeBits::decode(minor_key_); }
 #endif  // _WIN64
 
   bool NeedsImmovableCode();
 
   class SaveDoublesBits : public BitField<bool, 0, 1> {};
   class ResultSizeBits : public BitField<int, 1, 3> {};
 
   DISALLOW_COPY_AND_ASSIGN(CEntryStub);
 };
 
 
 class JSEntryStub : public PlatformCodeStub {
  public:
   explicit JSEntryStub(Isolate* isolate) : PlatformCodeStub(isolate) { }
 
   void Generate(MacroAssembler* masm) { GenerateBody(masm, false); }
 
  protected:
   void GenerateBody(MacroAssembler* masm, bool is_construct);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return JSEntry; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   virtual void FinishCode(Handle<Code> code);
 
   int handler_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(JSEntryStub);
 };
 
 
 class JSConstructEntryStub : public JSEntryStub {
@@ skipping 20 matching lines @@
     NEW_SLOPPY_FAST,
     NEW_SLOPPY_SLOW,
     NEW_STRICT
   };
 
   ArgumentsAccessStub(Isolate* isolate, Type type) : PlatformCodeStub(isolate) {
     minor_key_ = TypeBits::encode(type);
   }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return ArgumentsAccess; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   Type type() const { return TypeBits::decode(minor_key_); }
 
   void Generate(MacroAssembler* masm);
   void GenerateReadElement(MacroAssembler* masm);
   void GenerateNewStrict(MacroAssembler* masm);
   void GenerateNewSloppyFast(MacroAssembler* masm);
   void GenerateNewSloppySlow(MacroAssembler* masm);
 
   virtual void PrintName(OStream& os) const OVERRIDE;  // NOLINT
 
   class TypeBits : public BitField<Type, 0, 2> {};
 
   DISALLOW_COPY_AND_ASSIGN(ArgumentsAccessStub);
 };
 
 
 class RegExpExecStub: public PlatformCodeStub {
  public:
   explicit RegExpExecStub(Isolate* isolate) : PlatformCodeStub(isolate) { }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return RegExpExec; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(RegExpExecStub);
 };
 
 
 class RegExpConstructResultStub FINAL : public HydrogenCodeStub {
  public:
   explicit RegExpConstructResultStub(Isolate* isolate)
       : HydrogenCodeStub(isolate) { }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
-  virtual Major MajorKey() const OVERRIDE { return RegExpConstructResult; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   // Parameters accessed via CodeStubGraphBuilder::GetParameter()
   static const int kLength = 0;
   static const int kIndex = 1;
   static const int kInput = 2;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RegExpConstructResultStub);
@@ skipping 11 matching lines @@
   void Generate(MacroAssembler* masm);
 
   static int ExtractArgcFromMinorKey(int minor_key) {
     return ArgcBits::decode(minor_key);
   }
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return CallFunction; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   int argc() const { return ArgcBits::decode(minor_key_); }
   int flags() const { return FlagBits::decode(minor_key_); }
 
   bool CallAsMethod() const {
     return flags() == CALL_AS_METHOD || flags() == WRAP_AND_CALL;
   }
 
   bool NeedsChecks() const { return flags() != WRAP_AND_CALL; }
 
@@ skipping 18 matching lines @@
   void Generate(MacroAssembler* masm);
 
   virtual void FinishCode(Handle<Code> code) {
     code->set_has_function_cache(RecordCallTarget());
   }
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return CallConstruct; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   CallConstructorFlags flags() const { return FlagBits::decode(minor_key_); }
 
   bool RecordCallTarget() const {
     return (flags() & RECORD_CONSTRUCTOR_TARGET) != 0;
   }
 
   virtual void PrintName(OStream& os) const OVERRIDE;  // NOLINT
 
   class FlagBits : public BitField<CallConstructorFlags, 0, 1> {};
@@ skipping 172 matching lines @@
   StringCharCodeAtGenerator char_code_at_generator_;
   StringCharFromCodeGenerator char_from_code_generator_;
 
   DISALLOW_COPY_AND_ASSIGN(StringCharAtGenerator);
 };
 
 
 class LoadDictionaryElementStub : public HydrogenCodeStub {
  public:
   explicit LoadDictionaryElementStub(Isolate* isolate)
-      : HydrogenCodeStub(isolate) {
-    set_sub_minor_key(DICTIONARY_ELEMENTS);
-  }
+      : HydrogenCodeStub(isolate) {}
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return LoadElement; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(LoadDictionaryElementStub);
 };
 
 
-class LoadDictionaryElementPlatformStub : public PlatformCodeStub {
- public:
-  explicit LoadDictionaryElementPlatformStub(Isolate* isolate)
-      : PlatformCodeStub(isolate) {
-    minor_key_ = DICTIONARY_ELEMENTS;
-  }
-
-  void Generate(MacroAssembler* masm);
-
- private:
-  virtual Major MajorKey() const OVERRIDE { return LoadElement; }
-
-  DISALLOW_COPY_AND_ASSIGN(LoadDictionaryElementPlatformStub);
-};
-
-
 class KeyedLoadGenericStub : public HydrogenCodeStub {
  public:
   explicit KeyedLoadGenericStub(Isolate* isolate) : HydrogenCodeStub(isolate) {}
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   virtual Code::Kind GetCodeKind() const { return Code::KEYED_LOAD_IC; }
   virtual InlineCacheState GetICState() const { return GENERIC; }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return KeyedLoadGeneric; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(KeyedLoadGenericStub);
 };
 
 
 class LoadICTrampolineStub : public PlatformCodeStub {
  public:
   LoadICTrampolineStub(Isolate* isolate, const LoadIC::State& state)
       : PlatformCodeStub(isolate) {
     minor_key_ = state.GetExtraICState();
   }
 
   virtual Code::Kind GetCodeKind() const OVERRIDE { return Code::LOAD_IC; }
 
   virtual InlineCacheState GetICState() const FINAL OVERRIDE {
     return GENERIC;
   }
 
   virtual ExtraICState GetExtraICState() const FINAL OVERRIDE {
     return static_cast<ExtraICState>(minor_key_);
   }
 
-  virtual Major MajorKey() const OVERRIDE { return LoadICTrampoline; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
  private:
   LoadIC::State state() const {
     return LoadIC::State(static_cast<ExtraICState>(minor_key_));
   }
 
   virtual void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(LoadICTrampolineStub);
 };
 
 
 class KeyedLoadICTrampolineStub : public LoadICTrampolineStub {
  public:
   explicit KeyedLoadICTrampolineStub(Isolate* isolate)
       : LoadICTrampolineStub(isolate, LoadIC::State(0)) {}
 
   virtual Code::Kind GetCodeKind() const OVERRIDE {
     return Code::KEYED_LOAD_IC;
   }
 
-  virtual Major MajorKey() const OVERRIDE { return KeyedLoadICTrampoline; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
  private:
   virtual void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(KeyedLoadICTrampolineStub);
 };
 
 
 class VectorLoadStub : public HydrogenCodeStub {
  public:
@@ skipping 13 matching lines @@
 
   virtual InlineCacheState GetICState() const FINAL OVERRIDE {
     return GENERIC;
   }
 
   virtual ExtraICState GetExtraICState() const FINAL OVERRIDE {
     return static_cast<ExtraICState>(sub_minor_key());
   }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return VectorLoad; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   LoadIC::State state() const { return LoadIC::State(GetExtraICState()); }
 
   DISALLOW_COPY_AND_ASSIGN(VectorLoadStub);
 };
 
 
 class VectorKeyedLoadStub : public VectorLoadStub {
  public:
   explicit VectorKeyedLoadStub(Isolate* isolate)
       : VectorLoadStub(isolate, LoadIC::State(0)) {}
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   virtual Code::Kind GetCodeKind() const OVERRIDE {
     return Code::KEYED_LOAD_IC;
   }
 
-  virtual Major MajorKey() const OVERRIDE { return VectorKeyedLoad; }
+ private:
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
- private:
   DISALLOW_COPY_AND_ASSIGN(VectorKeyedLoadStub);
 };
 
 
 class DoubleToIStub : public PlatformCodeStub {
  public:
   DoubleToIStub(Isolate* isolate, Register source, Register destination,
                 int offset, bool is_truncating, bool skip_fastpath = false)
       : PlatformCodeStub(isolate) {
     minor_key_ = SourceRegisterBits::encode(source.code()) |
                  DestinationRegisterBits::encode(destination.code()) |
                  OffsetBits::encode(offset) |
                  IsTruncatingBits::encode(is_truncating) |
                  SkipFastPathBits::encode(skip_fastpath) |
                  SSE3Bits::encode(CpuFeatures::IsSupported(SSE3) ? 1 : 0);
   }
 
   void Generate(MacroAssembler* masm);
 
   virtual bool SometimesSetsUpAFrame() { return false; }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return DoubleToI; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   Register source() const {
     return Register::from_code(SourceRegisterBits::decode(minor_key_));
   }
   Register destination() const {
     return Register::from_code(DestinationRegisterBits::decode(minor_key_));
   }
   bool is_truncating() const { return IsTruncatingBits::decode(minor_key_); }
   bool skip_fastpath() const { return SkipFastPathBits::decode(minor_key_); }
   int offset() const { return OffsetBits::decode(minor_key_); }
@@ skipping 34 matching lines @@
   }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return LoadElement; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class ElementsKindBits: public BitField<ElementsKind, 0, 8> {};
   class IsJSArrayBits: public BitField<bool, 8, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(LoadFastElementStub);
 };
 
 
 class StoreFastElementStub : public HydrogenCodeStub {
  public:
@@ skipping 14 matching lines @@
   KeyedAccessStoreMode store_mode() const {
     return StoreModeBits::decode(sub_minor_key());
   }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return StoreElement; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class ElementsKindBits: public BitField<ElementsKind,      0, 8> {};
   class StoreModeBits: public BitField<KeyedAccessStoreMode, 8, 4> {};
   class IsJSArrayBits: public BitField<bool,                12, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(StoreFastElementStub);
 };
 
 
 class TransitionElementsKindStub : public HydrogenCodeStub {
@@ skipping 14 matching lines @@
   ElementsKind to_kind() const { return ToKindBits::decode(sub_minor_key()); }
 
   bool is_js_array() const { return IsJSArrayBits::decode(sub_minor_key()); }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return TransitionElementsKind; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class FromKindBits: public BitField<ElementsKind, 8, 8> {};
   class ToKindBits: public BitField<ElementsKind, 0, 8> {};
   class IsJSArrayBits: public BitField<bool, 16, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(TransitionElementsKindStub);
 };
 
 
 class ArrayConstructorStubBase : public HydrogenCodeStub {
@@ skipping 49 matching lines @@
       AllocationSiteOverrideMode override_mode = DONT_OVERRIDE)
       : ArrayConstructorStubBase(isolate, kind, override_mode) {
   }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return ArrayNoArgumentConstructor;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   virtual void PrintName(OStream& os) const OVERRIDE {  // NOLINT
     BasePrintName(os, "ArrayNoArgumentConstructorStub");
   }
 
   DISALLOW_COPY_AND_ASSIGN(ArrayNoArgumentConstructorStub);
 };
 
 
 class ArraySingleArgumentConstructorStub : public ArrayConstructorStubBase {
  public:
   ArraySingleArgumentConstructorStub(
       Isolate* isolate,
       ElementsKind kind,
       AllocationSiteOverrideMode override_mode = DONT_OVERRIDE)
       : ArrayConstructorStubBase(isolate, kind, override_mode) {
   }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return ArraySingleArgumentConstructor;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   virtual void PrintName(OStream& os) const {  // NOLINT
     BasePrintName(os, "ArraySingleArgumentConstructorStub");
   }
 
   DISALLOW_COPY_AND_ASSIGN(ArraySingleArgumentConstructorStub);
 };
 
 
 class ArrayNArgumentsConstructorStub : public ArrayConstructorStubBase {
  public:
   ArrayNArgumentsConstructorStub(
       Isolate* isolate,
       ElementsKind kind,
       AllocationSiteOverrideMode override_mode = DONT_OVERRIDE)
       : ArrayConstructorStubBase(isolate, kind, override_mode) {
   }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return ArrayNArgumentsConstructor;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   virtual void PrintName(OStream& os) const {  // NOLINT
     BasePrintName(os, "ArrayNArgumentsConstructorStub");
   }
 
   DISALLOW_COPY_AND_ASSIGN(ArrayNArgumentsConstructorStub);
 };
 
 
 class InternalArrayConstructorStubBase : public HydrogenCodeStub {
@@ skipping 26 matching lines @@
   InternalArrayNoArgumentConstructorStub(Isolate* isolate,
                                          ElementsKind kind)
       : InternalArrayConstructorStubBase(isolate, kind) { }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return InternalArrayNoArgumentConstructor;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(InternalArrayNoArgumentConstructorStub);
 };
 
 
 class InternalArraySingleArgumentConstructorStub : public
     InternalArrayConstructorStubBase {
  public:
   InternalArraySingleArgumentConstructorStub(Isolate* isolate,
                                              ElementsKind kind)
       : InternalArrayConstructorStubBase(isolate, kind) { }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return InternalArraySingleArgumentConstructor;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(InternalArraySingleArgumentConstructorStub);
 };
 
 
 class InternalArrayNArgumentsConstructorStub : public
     InternalArrayConstructorStubBase {
  public:
   InternalArrayNArgumentsConstructorStub(Isolate* isolate, ElementsKind kind)
       : InternalArrayConstructorStubBase(isolate, kind) { }
 
   virtual Handle<Code> GenerateCode() OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) OVERRIDE;
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return InternalArrayNArgumentsConstructor;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(InternalArrayNArgumentsConstructorStub);
 };
 
 
 class StoreElementStub : public PlatformCodeStub {
  public:
   StoreElementStub(Isolate* isolate, ElementsKind elements_kind)
       : PlatformCodeStub(isolate) {
     minor_key_ = ElementsKindBits::encode(elements_kind);
   }
 
   void Generate(MacroAssembler* masm);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return StoreElement; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   ElementsKind elements_kind() const {
     return ElementsKindBits::decode(minor_key_);
   }
 
   class ElementsKindBits : public BitField<ElementsKind, 0, 8> {};
 
   DISALLOW_COPY_AND_ASSIGN(StoreElementStub);
 };
 
@@ skipping 75 matching lines @@
 
   virtual InlineCacheState GetICState() const {
     if (types().IsEmpty()) {
       return ::v8::internal::UNINITIALIZED;
     } else {
       return MONOMORPHIC;
     }
   }
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return ToBoolean; }
-
   ToBooleanStub(Isolate* isolate, InitializationState init_state)
       : HydrogenCodeStub(isolate, init_state) {
     set_sub_minor_key(ResultModeBits::encode(RESULT_AS_SMI));
   }
 
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
+
   class TypesBits : public BitField<byte, 0, NUMBER_OF_TYPES> {};
   class ResultModeBits : public BitField<ResultMode, NUMBER_OF_TYPES, 2> {};
 
   DISALLOW_COPY_AND_ASSIGN(ToBooleanStub);
 };
 
 
 OStream& operator<<(OStream& os, const ToBooleanStub::Types& t);
 
 
@@ skipping 36 matching lines @@
     return ElementTransitionAndStoreDescriptor::MapRegister();
   }
   static const Register KeyRegister() {
     return ElementTransitionAndStoreDescriptor::NameRegister();
   }
   static const Register ObjectRegister() {
     return ElementTransitionAndStoreDescriptor::ReceiverRegister();
   }
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return ElementsTransitionAndStore;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   class FromBits : public BitField<ElementsKind, 0, 8> {};
   class ToBits : public BitField<ElementsKind, 8, 8> {};
   class IsJSArrayBits : public BitField<bool, 16, 1> {};
   class StoreModeBits : public BitField<KeyedAccessStoreMode, 17, 4> {};
 
   DISALLOW_COPY_AND_ASSIGN(ElementsTransitionAndStoreStub);
 };
 
 
 class StoreArrayLiteralElementStub : public PlatformCodeStub {
  public:
   explicit StoreArrayLiteralElementStub(Isolate* isolate)
       : PlatformCodeStub(isolate) { }
 
  private:
-  virtual Major MajorKey() const OVERRIDE {
-    return StoreArrayLiteralElement;
-  }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(StoreArrayLiteralElementStub);
 };
 
 
 class StubFailureTrampolineStub : public PlatformCodeStub {
  public:
   StubFailureTrampolineStub(Isolate* isolate, StubFunctionMode function_mode)
       : PlatformCodeStub(isolate) {
     minor_key_ = FunctionModeField::encode(function_mode);
   }
 
   static void GenerateAheadOfTime(Isolate* isolate);
 
  private:
-  virtual Major MajorKey() const OVERRIDE { return StubFailureTrampoline; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   StubFunctionMode function_mode() const {
     return FunctionModeField::decode(minor_key_);
   }
 
   void Generate(MacroAssembler* masm);
 
   class FunctionModeField : public BitField<StubFunctionMode, 0, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(StubFailureTrampolineStub);
 };
 
 
 class ProfileEntryHookStub : public PlatformCodeStub {
  public:
   explicit ProfileEntryHookStub(Isolate* isolate) : PlatformCodeStub(isolate) {}
 
   // The profile entry hook function is not allowed to cause a GC.
   virtual bool SometimesSetsUpAFrame() { return false; }
 
   // Generates a call to the entry hook if it's enabled.
   static void MaybeCallEntryHook(MacroAssembler* masm);
 
  private:
   static void EntryHookTrampoline(intptr_t function,
                                   intptr_t stack_pointer,
                                   Isolate* isolate);
 
-  virtual Major MajorKey() const OVERRIDE { return ProfileEntryHook; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(ProfileEntryHookStub);
 };
 
 
 class StoreBufferOverflowStub : public PlatformCodeStub {
  public:
   StoreBufferOverflowStub(Isolate* isolate, SaveFPRegsMode save_fp)
       : PlatformCodeStub(isolate) {
     minor_key_ = SaveDoublesBits::encode(save_fp == kSaveFPRegs);
   }
 
   void Generate(MacroAssembler* masm);
 
   static void GenerateFixedRegStubsAheadOfTime(Isolate* isolate);
   virtual bool SometimesSetsUpAFrame() { return false; }
 
  private:
-  Major MajorKey() const OVERRIDE { return StoreBufferOverflow; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   bool save_doubles() const { return SaveDoublesBits::decode(minor_key_); }
 
   class SaveDoublesBits : public BitField<bool, 0, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(StoreBufferOverflowStub);
 };
 
 
 class SubStringStub : public PlatformCodeStub {
  public:
   explicit SubStringStub(Isolate* isolate) : PlatformCodeStub(isolate) {}
 
  private:
-  Major MajorKey() const OVERRIDE { return SubString; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(SubStringStub);
 };
 
 
 class StringCompareStub : public PlatformCodeStub {
  public:
   explicit StringCompareStub(Isolate* isolate) : PlatformCodeStub(isolate) {}
 
  private:
-  virtual Major MajorKey() const { return StringCompare; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   virtual void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(StringCompareStub);
 };
+
+
+#define DEFINE_MAJOR_KEY(NAME) \
+  CodeStub::Major NAME##Stub::MajorKey() const { return NAME; }
+
+CODE_STUB_LIST(DEFINE_MAJOR_KEY)
+
+#undef DEFINE_MAJOR_KEY
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_