Tiny simplification of FieldIndex::ForInObjectOffset.

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 {
 namespace internal {
 
 
 inline FieldIndex FieldIndex::ForInObjectOffset(int offset, Map* map) {
   DCHECK((offset % kPointerSize) == 0);
   int index = offset / kPointerSize;
-  if (map == NULL) {
-    return FieldIndex(true, index, false, index + 1, 0, true);

[danno, 2015/02/05 13:17:52]

Where did the "index + 1" go for parameter 4? At first blush I don't think it
can simply be replaced with 0

-  }
-  int first_inobject_offset = map->GetInObjectPropertyOffset(0);
-  if (offset < first_inobject_offset) {
-    return FieldIndex(true, index, false, 0, 0, true);
-  } else {
-    return FieldIndex::ForPropertyIndex(map, offset / kPointerSize);
-  }
+  return (map == NULL || offset < map->GetInObjectPropertyOffset(0))
+             ? FieldIndex(true, index, false, 0, 0, true)
+             : FieldIndex::ForPropertyIndex(map, index);
 }
 
 
 inline FieldIndex FieldIndex::ForPropertyIndex(Map* map,
                                                int property_index,
                                                bool is_double) {
   DCHECK(map->instance_type() >= FIRST_NONSTRING_TYPE);
   int inobject_properties = map->inobject_properties();
   bool is_inobject = property_index < inobject_properties;
   int first_inobject_offset;
@@ skipping 84 matching lines @@
     return GetLoadByFieldIndex();
   } else {
     return property_index();
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif