Revert "The current growth strategy for growable arrays allocates a backing array of size 2 at (emp…

runtime/vm/object_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 
 #include "vm/assembler.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 2130 matching lines @@
     value = Smi::New(i * 10);
     array.SetAt(i, value);
   }
   EXPECT_EQ(10, array.Length());
   for (intptr_t i = 0; i < 10; i++) {
     expected_value = Smi::New(i * 10);
     value ^= array.At(i);
     EXPECT(value.Equals(expected_value));
   }
 
-  // Test the MakeFixedLength functionality to make sure the resulting array
+  // Test the MakeArray functionality to make sure the resulting array
   // object is properly setup.
   // 1. Should produce an array of length 2 and a left over int8 array.
   Array& new_array = Array::Handle();
   TypedData& left_over_array = TypedData::Handle();
   Object& obj = Object::Handle();
   uword addr = 0;
   intptr_t used_size = 0;
 
   array = GrowableObjectArray::New(kArrayLen + 1);
   EXPECT_EQ(kArrayLen + 1, array.Capacity());
   EXPECT_EQ(0, array.Length());
   for (intptr_t i = 0; i < 2; i++) {
     value = Smi::New(i);
     array.Add(value);
   }
   used_size = Array::InstanceSize(array.Length());
-  new_array = Array::MakeFixedLength(array);
+  new_array = Array::MakeArray(array);
   addr = RawObject::ToAddr(new_array.raw());
   obj = RawObject::FromAddr(addr);
   EXPECT(obj.IsArray());
   new_array ^= obj.raw();
   EXPECT_EQ(2, new_array.Length());
   addr += used_size;
   obj = RawObject::FromAddr(addr);
   EXPECT(obj.IsTypedData());
   left_over_array ^= obj.raw();
   EXPECT_EQ((2 * kWordSize), left_over_array.Length());
 
   // 2. Should produce an array of length 3 and a left over int8 array.
   array = GrowableObjectArray::New(kArrayLen);
   EXPECT_EQ(kArrayLen, array.Capacity());
   EXPECT_EQ(0, array.Length());
   for (intptr_t i = 0; i < 3; i++) {
     value = Smi::New(i);
     array.Add(value);
   }
   used_size = Array::InstanceSize(array.Length());
-  new_array = Array::MakeFixedLength(array);
+  new_array = Array::MakeArray(array);
   addr = RawObject::ToAddr(new_array.raw());
   obj = RawObject::FromAddr(addr);
   EXPECT(obj.IsArray());
   new_array ^= obj.raw();
   EXPECT_EQ(3, new_array.Length());
   addr += used_size;
   obj = RawObject::FromAddr(addr);
   EXPECT(obj.IsTypedData());
   left_over_array ^= obj.raw();
   EXPECT_EQ(0, left_over_array.Length());
 
   // 3. Should produce an array of length 1 and a left over int8 array.
   array = GrowableObjectArray::New(kArrayLen + 3);
   EXPECT_EQ((kArrayLen + 3), array.Capacity());
   EXPECT_EQ(0, array.Length());
   for (intptr_t i = 0; i < 1; i++) {
     value = Smi::New(i);
     array.Add(value);
   }
   used_size = Array::InstanceSize(array.Length());
-  new_array = Array::MakeFixedLength(array);
+  new_array = Array::MakeArray(array);
   addr = RawObject::ToAddr(new_array.raw());
   obj = RawObject::FromAddr(addr);
   EXPECT(obj.IsArray());
   new_array ^= obj.raw();
   EXPECT_EQ(1, new_array.Length());
   addr += used_size;
   obj = RawObject::FromAddr(addr);
   EXPECT(obj.IsTypedData());
   left_over_array ^= obj.raw();
   EXPECT_EQ((6 * kWordSize), left_over_array.Length());
 
   // 4. Verify that GC can handle the filler object for a large array.
   array = GrowableObjectArray::New((1 * MB) >> kWordSizeLog2);
   EXPECT_EQ(0, array.Length());
   for (intptr_t i = 0; i < 1; i++) {
     value = Smi::New(i);
     array.Add(value);
   }
   Heap* heap = Isolate::Current()->heap();
   heap->CollectAllGarbage();
   intptr_t capacity_before = heap->CapacityInWords(Heap::kOld);
-  new_array = Array::MakeFixedLength(array);
+  new_array = Array::MakeArray(array);
   EXPECT_EQ(1, new_array.Length());
   heap->CollectAllGarbage();
   intptr_t capacity_after = heap->CapacityInWords(Heap::kOld);
   // Page should shrink.
   EXPECT_LT(capacity_after, capacity_before);
   EXPECT_EQ(1, new_array.Length());
 }
 
 
 ISOLATE_UNIT_TEST_CASE(InternalTypedData) {
@@ skipping 2501 matching lines @@
   // utf32->utf16 conversion.
   int32_t char_codes[] = {0,      0x0a,   0x0d,   0x7f,   0xff,
                           0xffff, 0xd800, 0xdc00, 0xdbff, 0xdfff};
 
   const String& str =
       String::Handle(String::FromUTF32(char_codes, ARRAY_SIZE(char_codes)));
   EXPECT(str.Equals(char_codes, ARRAY_SIZE(char_codes)));
 }
 
 }  // namespace dart