Clean up code stubs and ensure distinct major keys.

src/arm/code-stubs-arm.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_ARM_CODE_STUBS_ARM_H_
 #define V8_ARM_CODE_STUBS_ARM_H_
 
 #include "src/code-stubs.h"
 
 namespace v8 {
@@ skipping 68 matching lines @@
                              Register the_heap_number, Register scratch)
       : PlatformCodeStub(isolate) {
     minor_key_ = IntRegisterBits::encode(the_int.code()) |
                  HeapNumberRegisterBits::encode(the_heap_number.code()) |
                  ScratchRegisterBits::encode(scratch.code());
   }
 
   static void GenerateFixedRegStubsAheadOfTime(Isolate* isolate);
 
  private:
-  Major MajorKey() const { return WriteInt32ToHeapNumber; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   void Generate(MacroAssembler* masm);
 
   Register the_int() const {
     return Register::from_code(IntRegisterBits::decode(minor_key_));
   }
 
   Register the_heap_number() const {
     return Register::from_code(HeapNumberRegisterBits::decode(minor_key_));
   }
@@ skipping 150 matching lines @@
     Register scratch1_;
 
     friend class RecordWriteStub;
   };
 
   enum OnNoNeedToInformIncrementalMarker {
     kReturnOnNoNeedToInformIncrementalMarker,
     kUpdateRememberedSetOnNoNeedToInformIncrementalMarker
   };
 
-  Major MajorKey() const { return RecordWrite; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   void Generate(MacroAssembler* masm);
   void GenerateIncremental(MacroAssembler* masm, Mode mode);
   void CheckNeedsToInformIncrementalMarker(
       MacroAssembler* masm,
       OnNoNeedToInformIncrementalMarker on_no_need,
       Mode mode);
   void InformIncrementalMarker(MacroAssembler* masm);
 
   void Activate(Code* code) {
@@ skipping 38 matching lines @@
 // keep the code which called into native pinned in the memory. Currently the
 // simplest approach is to generate such stub early enough so it can never be
 // moved by GC
 class DirectCEntryStub: public PlatformCodeStub {
  public:
   explicit DirectCEntryStub(Isolate* isolate) : PlatformCodeStub(isolate) {}
   void Generate(MacroAssembler* masm);
   void GenerateCall(MacroAssembler* masm, Register target);
 
  private:
-  Major MajorKey() const { return DirectCEntry; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   bool NeedsImmovableCode() { return true; }
 
   DISALLOW_COPY_AND_ASSIGN(DirectCEntryStub);
 };
 
 
 class NameDictionaryLookupStub: public PlatformCodeStub {
  public:
   enum LookupMode { POSITIVE_LOOKUP, NEGATIVE_LOOKUP };
@@ skipping 28 matching lines @@
   static const int kTotalProbes = 20;
 
   static const int kCapacityOffset =
       NameDictionary::kHeaderSize +
       NameDictionary::kCapacityIndex * kPointerSize;
 
   static const int kElementsStartOffset =
       NameDictionary::kHeaderSize +
       NameDictionary::kElementsStartIndex * kPointerSize;
 
-  Major MajorKey() const { return NameDictionaryLookup; }
+  virtual inline Major MajorKey() const FINAL OVERRIDE;
 
   LookupMode mode() const { return LookupModeBits::decode(minor_key_); }
 
   class LookupModeBits: public BitField<LookupMode, 0, 1> {};
 
   DISALLOW_COPY_AND_ASSIGN(NameDictionaryLookupStub);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_CODE_STUBS_ARM_H_