| Index: src/objects-debug.cc
 | 
| diff --git a/src/objects-debug.cc b/src/objects-debug.cc
 | 
| index cd2ccf81c775187266357dc49c371b04ede4e431..6f843e529d99671af8d6068003944a2db46a1ff6 100644
 | 
| --- a/src/objects-debug.cc
 | 
| +++ b/src/objects-debug.cc
 | 
| @@ -286,12 +286,11 @@ void JSObject::JSObjectVerify() {
 | 
|               (map()->inobject_properties() + properties()->length() -
 | 
|                map()->NextFreePropertyIndex()));
 | 
|    }
 | 
| -  ASSERT_EQ((map()->has_fast_elements() ||
 | 
| -             map()->has_fast_smi_only_elements() ||
 | 
| +  ASSERT_EQ((map()->has_fast_smi_or_object_elements() ||
 | 
|               (elements() == GetHeap()->empty_fixed_array())),
 | 
|              (elements()->map() == GetHeap()->fixed_array_map() ||
 | 
|               elements()->map() == GetHeap()->fixed_cow_array_map()));
 | 
| -  ASSERT(map()->has_fast_elements() == HasFastElements());
 | 
| +  ASSERT(map()->has_fast_object_elements() == HasFastObjectElements());
 | 
|  }
 | 
|  
 | 
|  
 | 
| @@ -508,7 +507,7 @@ void JSGlobalProxy::JSGlobalProxyVerify() {
 | 
|    VerifyObjectField(JSGlobalProxy::kContextOffset);
 | 
|    // Make sure that this object has no properties, elements.
 | 
|    CHECK_EQ(0, properties()->length());
 | 
| -  CHECK(HasFastElements());
 | 
| +  CHECK(HasFastObjectElements());
 | 
|    CHECK_EQ(0, FixedArray::cast(elements())->length());
 | 
|  }
 | 
|  
 | 
| @@ -803,6 +802,11 @@ void JSObject::IncrementSpillStatistics(SpillInformation* info) {
 | 
|    }
 | 
|    // Indexed properties
 | 
|    switch (GetElementsKind()) {
 | 
| +    case FAST_HOLEY_SMI_ELEMENTS:
 | 
| +    case FAST_SMI_ELEMENTS:
 | 
| +    case FAST_HOLEY_DOUBLE_ELEMENTS:
 | 
| +    case FAST_DOUBLE_ELEMENTS:
 | 
| +    case FAST_HOLEY_ELEMENTS:
 | 
|      case FAST_ELEMENTS: {
 | 
|        info->number_of_objects_with_fast_elements_++;
 | 
|        int holes = 0;
 | 
| @@ -816,6 +820,14 @@ void JSObject::IncrementSpillStatistics(SpillInformation* info) {
 | 
|        info->number_of_fast_unused_elements_ += holes;
 | 
|        break;
 | 
|      }
 | 
| +    case EXTERNAL_BYTE_ELEMENTS:
 | 
| +    case EXTERNAL_UNSIGNED_BYTE_ELEMENTS:
 | 
| +    case EXTERNAL_SHORT_ELEMENTS:
 | 
| +    case EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
 | 
| +    case EXTERNAL_INT_ELEMENTS:
 | 
| +    case EXTERNAL_UNSIGNED_INT_ELEMENTS:
 | 
| +    case EXTERNAL_FLOAT_ELEMENTS:
 | 
| +    case EXTERNAL_DOUBLE_ELEMENTS:
 | 
|      case EXTERNAL_PIXEL_ELEMENTS: {
 | 
|        info->number_of_objects_with_fast_elements_++;
 | 
|        ExternalPixelArray* e = ExternalPixelArray::cast(elements());
 | 
| @@ -829,8 +841,7 @@ void JSObject::IncrementSpillStatistics(SpillInformation* info) {
 | 
|            dict->Capacity() - dict->NumberOfElements();
 | 
|        break;
 | 
|      }
 | 
| -    default:
 | 
| -      UNREACHABLE();
 | 
| +    case NON_STRICT_ARGUMENTS_ELEMENTS:
 | 
|        break;
 | 
|    }
 | 
|  }
 | 
| 
 |