| Index: src/objects.cc
|
| diff --git a/src/objects.cc b/src/objects.cc
|
| index 5649a56464bb69300c1b031dd5c5cf4a45fbf53e..08a2e8eeac04102228d9176d9cd0e1340301af23 100644
|
| --- a/src/objects.cc
|
| +++ b/src/objects.cc
|
| @@ -8653,7 +8653,7 @@ MaybeObject* JSObject::SetFastDoubleElementsCapacityAndLength(
|
| // We should never end in here with a pixel or external array.
|
| ASSERT(!HasExternalArrayElements());
|
|
|
| - FixedDoubleArray* elems;
|
| + FixedArrayBase* elems;
|
| { MaybeObject* maybe_obj =
|
| heap->AllocateUninitializedFixedDoubleArray(capacity);
|
| if (!maybe_obj->To(&elems)) return maybe_obj;
|
| @@ -9807,9 +9807,10 @@ MaybeObject* JSObject::TransitionElementsKind(ElementsKind to_kind) {
|
| ElementsKind from_kind = map()->elements_kind();
|
|
|
| Isolate* isolate = GetIsolate();
|
| - if (from_kind == FAST_SMI_ONLY_ELEMENTS &&
|
| - (to_kind == FAST_ELEMENTS ||
|
| - elements() == isolate->heap()->empty_fixed_array())) {
|
| + if ((from_kind == FAST_SMI_ONLY_ELEMENTS ||
|
| + elements() == isolate->heap()->empty_fixed_array()) &&
|
| + to_kind == FAST_ELEMENTS) {
|
| + ASSERT(from_kind != FAST_ELEMENTS);
|
| MaybeObject* maybe_new_map = GetElementsTransitionMap(isolate, to_kind);
|
| Map* new_map;
|
| if (!maybe_new_map->To(&new_map)) return maybe_new_map;
|
|
|