Do not use object pool for VM heap objects on ARM.

runtime/vm/object.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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 7684 matching lines @@
                            instrs.EntryPoint(),
                            assembler->prologue_offset(),
                            instrs.size(),
                            optimized);
 
   const ZoneGrowableArray<int>& pointer_offsets =
       assembler->GetPointerOffsets();
 
   // Allocate the code object.
   Code& code = Code::ZoneHandle(Code::New(pointer_offsets.length()));
-
-  // Clone the object pool in the old space, if necessary.
-  Array& object_pool = Array::Handle(
-      Array::MakeArray(assembler->object_pool()));
-  if (!object_pool.IsOld()) {
-    object_pool ^= Object::Clone(object_pool, Heap::kOld);
-  }
   {
     NoGCScope no_gc;
 
     // Set pointer offsets list in Code object and resolve all handles in
     // the instruction stream to raw objects.
     ASSERT(code.pointer_offsets_length() == pointer_offsets.length());
     for (int i = 0; i < pointer_offsets.length(); i++) {
       int offset_in_instrs = pointer_offsets[i];
       code.SetPointerOffsetAt(i, offset_in_instrs);
       const Object* object = region.Load<const Object*>(offset_in_instrs);
       region.Store<RawObject*>(offset_in_instrs, object->raw());
     }
 
     // Hook up Code and Instructions objects.
     instrs.set_code(code.raw());
     code.set_instructions(instrs.raw());
 
     // Set object pool in Instructions object.
-    instrs.set_object_pool(object_pool.raw());
+    const GrowableObjectArray& object_pool = assembler->object_pool();
+    if (object_pool.IsNull()) {
+      instrs.set_object_pool(Object::empty_array().raw());
+    } else {
+      // TODO(regis): Once MakeArray takes a Heap::Space argument, call it here
+      // with Heap::kOld and change the ARM and MIPS assemblers to work with a
+      // GrowableObjectArray in new space.
+      instrs.set_object_pool(Array::MakeArray(object_pool));
+    }
   }
   return code.raw();
 }
 
 
 RawCode* Code::FinalizeCode(const Function& function,
                             Assembler* assembler,
                             bool optimized) {
   // Calling ToFullyQualifiedCString is very expensive, try to avoid it.
   if (CodeObservers::AreActive()) {
@@ skipping 4478 matching lines @@
   Object& obj = Object::Handle();
   for (int i = 0; i < len; i++) {
     obj = source.At(i);
     result.SetAt(i, obj);
   }
   return result.raw();
 }
 
 
 RawArray* Array::MakeArray(const GrowableObjectArray& growable_array) {
-  if (growable_array.IsNull()) {
-    return Array::null();
+  ASSERT(!growable_array.IsNull());
+  intptr_t used_len = growable_array.Length();
+  if (used_len == 0) {
+    return Object::empty_array().raw();
   }
-  intptr_t used_len = growable_array.Length();
   intptr_t capacity_len = growable_array.Capacity();
   Isolate* isolate = Isolate::Current();
   const Array& array = Array::Handle(isolate, growable_array.data());
   intptr_t capacity_size = Array::InstanceSize(capacity_len);
   intptr_t used_size = Array::InstanceSize(used_len);
   NoGCScope no_gc;
 
   // Update the size in the header field and length of the array object.
   uword tags = array.raw_ptr()->tags_;
   ASSERT(kArrayCid == RawObject::ClassIdTag::decode(tags));
@@ skipping 1424 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart