| Index: src/objects-debug.cc
 | 
| diff --git a/src/objects-debug.cc b/src/objects-debug.cc
 | 
| index 9c03dcc2eacb4cd93b782e9520a99740fabbcf12..e79086ae4cebe977cd10d80607866ae53fc6cbe8 100644
 | 
| --- a/src/objects-debug.cc
 | 
| +++ b/src/objects-debug.cc
 | 
| @@ -276,7 +276,7 @@ void JSObject::JSObjectVerify() {
 | 
|      }
 | 
|      DescriptorArray* descriptors = map()->instance_descriptors();
 | 
|      for (int i = 0; i < map()->NumberOfOwnDescriptors(); i++) {
 | 
| -      if (descriptors->GetDetails(i).type() == FIELD) {
 | 
| +      if (descriptors->GetDetails(i).type() == DATA) {
 | 
|          Representation r = descriptors->GetDetails(i).representation();
 | 
|          FieldIndex index = FieldIndex::ForDescriptor(map(), i);
 | 
|          if (IsUnboxedDoubleField(index)) {
 | 
| @@ -1180,7 +1180,7 @@ bool LayoutDescriptor::IsConsistentWithMap(Map* map) {
 | 
|      int nof_descriptors = map->NumberOfOwnDescriptors();
 | 
|      for (int i = 0; i < nof_descriptors; i++) {
 | 
|        PropertyDetails details = descriptors->GetDetails(i);
 | 
| -      if (details.type() != FIELD) continue;
 | 
| +      if (details.type() != DATA) continue;
 | 
|        FieldIndex field_index = FieldIndex::ForDescriptor(map, i);
 | 
|        bool tagged_expected =
 | 
|            !field_index.is_inobject() || !details.representation().IsDouble();
 | 
| @@ -1198,13 +1198,13 @@ bool LayoutDescriptor::IsConsistentWithMap(Map* map) {
 | 
|  bool TransitionArray::IsSortedNoDuplicates(int valid_entries) {
 | 
|    DCHECK(valid_entries == -1);
 | 
|    Name* prev_key = NULL;
 | 
| -  PropertyKind prev_kind = DATA;
 | 
| +  PropertyKind prev_kind = kData;
 | 
|    PropertyAttributes prev_attributes = NONE;
 | 
|    uint32_t prev_hash = 0;
 | 
|    for (int i = 0; i < number_of_transitions(); i++) {
 | 
|      Name* key = GetSortedKey(i);
 | 
|      uint32_t hash = key->Hash();
 | 
| -    PropertyKind kind = DATA;
 | 
| +    PropertyKind kind = kData;
 | 
|      PropertyAttributes attributes = NONE;
 | 
|      if (!IsSpecialTransition(key)) {
 | 
|        Map* target = GetTarget(i);
 | 
| 
 |