Revert "Revert "Reland 21774: Generate KeyedLoadGeneric with Hydrogen""

src/field-index.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_FIELD_INDEX_H_
 #define V8_FIELD_INDEX_H_
 
 #include "src/utils.h"
 #include "src/property-details.h"
 
 namespace v8 {
 namespace internal {
 
 class Map;
 
 // Wrapper class to hold a field index, usually but not necessarily generated
 // from a property index. When available, the wrapper class captures additional
 // information to allow the field index to be translated back into the property
 // index it was originally generated from.
 class FieldIndex V8_FINAL {
  public:
   static FieldIndex ForPropertyIndex(Map* map,
                                      int index,
                                      bool is_double = false);
   static FieldIndex ForInObjectOffset(int offset, Map* map = NULL);
   static FieldIndex ForLookupResult(const LookupResult* result);
   static FieldIndex ForDescriptor(Map* map, int descriptor_index);
   static FieldIndex ForLoadByFieldIndex(Map* map, int index);
-  static FieldIndex ForKeyedLookupCacheIndex(Map* map, int index) {
-    return ForPropertyIndex(map, index);
-  }
+  static FieldIndex ForKeyedLookupCacheIndex(Map* map, int index);
 
   bool is_inobject() const {
     return IsInObjectBits::decode(bit_field_);
   }
 
   bool is_double() const {
     return IsDoubleBits::decode(bit_field_);
   }
 
   int offset() const {
@@ skipping 26 matching lines @@
     // The index itself is shifted up by one bit, the lower-most bit
     // signifying if the field is a mutable double box (1) or not (0).
     int result = index() - first_inobject_property_offset() / kPointerSize;
     if (!is_inobject()) {
       result = -result - 1;
     }
     result <<= 1;
     return is_double() ? (result | 1) : result;
   }
 
-  int GetKeyedLookupCacheIndex() const {
-    return property_index();
-  }
+  int GetKeyedLookupCacheIndex() const;
 
   int GetLoadFieldStubKey() const {
     return bit_field_ &
         (IsInObjectBits::kMask | IsDoubleBits::kMask | IndexBits::kMask);
   }
 
  private:
   FieldIndex(bool is_inobject, int local_index, bool is_double,
              int inobject_properties, int first_inobject_property_offset,
              bool is_hidden = false) {
@@ skipping 23 matching lines @@
   class IsHiddenField:
       public BitField<bool, FirstInobjectPropertyOffsetBits::kNext, 1> {};
   STATIC_ASSERT(IsHiddenField::kNext <= 32);
 
   int bit_field_;
 };
 
 } }  // namespace v8::internal
 
 #endif