| Index: runtime/vm/object.h
|
| diff --git a/runtime/vm/object.h b/runtime/vm/object.h
|
| index 9d5b4d9e2eaafd9542d20e3c6b44d3414870b892..2663fe647d558f11d186602a8578c9074495af00 100644
|
| --- a/runtime/vm/object.h
|
| +++ b/runtime/vm/object.h
|
| @@ -7665,10 +7665,7 @@ class Array : public Instance {
|
| // object or a regular Object so that it can be traversed during garbage
|
| // collection. The backing array of the original Growable Object Array is
|
| // set to an empty array.
|
| - // If the unique parameter is false, the function is allowed to return
|
| - // a shared Array instance.
|
| - static RawArray* MakeFixedLength(const GrowableObjectArray& growable_array,
|
| - bool unique = false);
|
| + static RawArray* MakeArray(const GrowableObjectArray& growable_array);
|
|
|
| RawArray* Slice(intptr_t start,
|
| intptr_t count,
|
| @@ -7782,6 +7779,8 @@ class GrowableObjectArray : public Instance {
|
| // reusing the type argument vector of the instantiator.
|
| ASSERT(value.IsNull() || ((value.Length() >= 1) && value.IsInstantiated() &&
|
| value.IsCanonical()));
|
| + const Array& contents = Array::Handle(data());
|
| + contents.SetTypeArguments(value);
|
| StorePointer(&raw_ptr()->type_arguments_, value.raw());
|
| }
|
|
|
| @@ -7832,7 +7831,7 @@ class GrowableObjectArray : public Instance {
|
| return &(DataArray()->data()[index]);
|
| }
|
|
|
| - static const int kDefaultInitialCapacity = 0;
|
| + static const int kDefaultInitialCapacity = 4;
|
|
|
| FINAL_HEAP_OBJECT_IMPLEMENTATION(GrowableObjectArray, Instance);
|
| friend class Array;
|
|
|