X87: Clean up code stubs and ensure distinct major keys.

src/x87/code-stubs-x87.h

 // Copyright 2011 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_X87_CODE_STUBS_X87_H_
 #define V8_X87_CODE_STUBS_X87_H_
 
 #include "src/code-stubs.h"
 
 namespace v8 {
@@ skipping 96 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;
 
   Register dictionary() const {
     return Register::from_code(DictionaryBits::decode(minor_key_));
   }
 
   Register result() const {
     return Register::from_code(ResultBits::decode(minor_key_));
   }
 
   Register index() const {
@@ skipping 203 matching lines @@
       return no_reg;
     }
     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 23 matching lines @@
 
   RegisterAllocation regs_;
 
   DISALLOW_COPY_AND_ASSIGN(RecordWriteStub);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_X87_CODE_STUBS_X87_H_