Revert of JSObject::GetEnumProperty cleanup

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"
 
 namespace v8 {
@@ skipping 71 matching lines @@
     result = -result - 1;
   }
   result <<= 1;
   return is_double() ? (result | 1) : result;
 }
 
 
 inline FieldIndex FieldIndex::ForDescriptor(Map* map, int descriptor_index) {
   PropertyDetails details =
       map->instance_descriptors()->GetDetails(descriptor_index);
-  int field_index = details.field_index();
+  int field_index =
+      map->instance_descriptors()->GetFieldIndex(descriptor_index);
   return ForPropertyIndex(map, field_index,
                           details.representation().IsDouble());
 }
 
 
 inline FieldIndex FieldIndex::ForKeyedLookupCacheIndex(Map* map, int index) {
   if (FLAG_compiled_keyed_generic_loads) {
     return ForLoadByFieldIndex(map, index);
   } else {
     return ForPropertyIndex(map, index);
@@ skipping 11 matching lines @@
     return GetLoadByFieldIndex();
   } else {
     return property_index();
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif