Chromium Code Reviews| Index: src/field-index-inl.h |
| diff --git a/src/field-index-inl.h b/src/field-index-inl.h |
| index 198422feef4b65f21c7f5c14cc867cc306fb1ff9..b2307cd0bd5aff15837629d4d90a21b624b6f077 100644 |
| --- a/src/field-index-inl.h |
| +++ b/src/field-index-inl.h |
| @@ -14,15 +14,9 @@ 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 f
|
| - } |
| - 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); |
| } |