Reland "[KeyedLoadIC] Support Smi "handlers" for element loads"

src/field-index-inl.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_INL_H_
 #define V8_FIELD_INDEX_INL_H_
 
 #include "src/field-index.h"
+#include "src/ic/handler-configuration.h"
 
 namespace v8 {
 namespace internal {
 
 
 inline FieldIndex FieldIndex::ForInObjectOffset(int offset, Map* map) {
   DCHECK((offset % kPointerSize) == 0);
   int index = offset / kPointerSize;
   DCHECK(map == NULL ||
          index < (map->GetInObjectPropertyOffset(0) / kPointerSize +
@@ skipping 62 matching lines @@
     result = -result - 1;
   }
   result <<= 1;
   return is_double() ? (result | 1) : result;
 }
 
 // Takes an offset as computed by GetLoadByFieldOffset and reconstructs a
 // FieldIndex object from it.
 // static
 inline FieldIndex FieldIndex::ForLoadByFieldOffset(Map* map, int offset) {
-  DCHECK(offset & 1);  // Property marker (as opposed to element).
+  DCHECK(LoadHandlerTypeBit::decode(offset) == kLoadICHandlerForProperties);
   bool is_inobject = FieldOffsetIsInobject::decode(offset);
   bool is_double = FieldOffsetIsDouble::decode(offset);
   int field_index = FieldOffsetOffset::decode(offset) >> kPointerSizeLog2;
   int first_inobject_offset = 0;
   if (is_inobject) {
     first_inobject_offset =
         map->IsJSObjectMap() ? map->GetInObjectPropertyOffset(0) : 0;
   } else {
     first_inobject_offset = FixedArray::kHeaderSize;
   }
   int inobject_properties =
       map->IsJSObjectMap() ? map->GetInObjectProperties() : 0;
   FieldIndex result(is_inobject, field_index, is_double, inobject_properties,
                     first_inobject_offset);
   DCHECK(result.GetLoadByFieldOffset() == offset);
   return result;
 }
 
 // Returns the offset format consumed by TurboFan stubs:
 // (offset << 3) | (is_double << 2) | (is_inobject << 1) | is_property
 // Where |offset| is relative to object start or FixedArray start, respectively.
 inline int FieldIndex::GetLoadByFieldOffset() const {
   return FieldOffsetIsInobject::encode(is_inobject()) |
          FieldOffsetIsDouble::encode(is_double()) |
          FieldOffsetOffset::encode(index() << kPointerSizeLog2) |
-         1;  // Property marker (as opposed to element).
+         LoadHandlerTypeBit::encode(kLoadICHandlerForProperties);
 }
 
 inline FieldIndex FieldIndex::ForDescriptor(Map* map, int descriptor_index) {
   PropertyDetails details =
       map->instance_descriptors()->GetDetails(descriptor_index);
   int field_index = details.field_index();
   return ForPropertyIndex(map, field_index,
                           details.representation().IsDouble());
 }
 
@@ skipping 18 matching lines @@
   } else {
     return property_index();
   }
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif