Index: src/objects-inl.h |
diff --git a/src/objects-inl.h b/src/objects-inl.h |
index a5ea659b60f2b35a0a0c7a0f864ffd9906508067..eef5e6bf6f7179900c2dc9e93a68fafbc6f08c0e 100644 |
--- a/src/objects-inl.h |
+++ b/src/objects-inl.h |
@@ -1339,11 +1339,12 @@ void JSObject::set_map_and_elements(Map* new_map, |
} |
} |
ASSERT((map()->has_fast_elements() || |
- map()->has_fast_smi_only_elements()) == |
+ map()->has_fast_smi_only_elements() || |
+ (value == GetHeap()->empty_fixed_array())) == |
(value->map() == GetHeap()->fixed_array_map() || |
value->map() == GetHeap()->fixed_cow_array_map())); |
- ASSERT(map()->has_fast_double_elements() == |
- value->IsFixedDoubleArray()); |
+ ASSERT((value == GetHeap()->empty_fixed_array()) || |
+ (map()->has_fast_double_elements() == value->IsFixedDoubleArray())); |
WRITE_FIELD(this, kElementsOffset, value); |
CONDITIONAL_WRITE_BARRIER(GetHeap(), this, kElementsOffset, value, mode); |
} |