Put metadata fields in their owner class.

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/cpu.h"
@@ skipping 2776 matching lines @@
   for (intptr_t i = 0; i < len; i++) {
     field ^= value.At(i);
     ASSERT(field.owner() == raw());
   }
 #endif
   // The value of static fields is already initialized to null.
   StorePointer(&raw_ptr()->fields_, value.raw());
 }
 
 
+void Class::AddField(const Field& field) const {
+  const Array& arr = Array::Handle(fields());
+  const Array& new_arr = Array::Handle(Array::Grow(arr, arr.Length() + 1));

[regis, 2014/05/08 16:39:11]

By default, Array::Grow will allocate in the new space. Is it what you want? I
do not know how frequently you add a field.

[rmacnak, 2014/05/08 18:14:54]

This path will only be hit when we encounter metadata.

+  new_arr.SetAt(arr.Length(), field);
+  SetFields(new_arr);
+}
+
+
+void Class::AddFields(const GrowableObjectArray& new_fields) const {
+  const intptr_t num_new_fields = new_fields.Length();
+  if (num_new_fields == 0) return;
+  const Array& arr = Array::Handle(fields());
+  const intptr_t num_old_fields = arr.Length();
+  const Array& new_arr =
+      Array::Handle(Array::Grow(arr, num_old_fields + num_new_fields));

[regis, 2014/05/08 16:39:11]

ditto

[rmacnak, 2014/05/08 18:14:54]

This will happen once when we parse the class members / clone a mixin.

+  Field& field = Field::Handle();
+  for (intptr_t i = 0; i < num_new_fields; i++) {
+    field ^= new_fields.At(i);
+    new_arr.SetAt(i + num_old_fields, field);
+  }
+  SetFields(new_arr);
+}
+
+
 intptr_t Class::FindFieldIndex(const Field& needle) const {
   Isolate* isolate = Isolate::Current();
   if (EnsureIsFinalized(isolate) != Error::null()) {
     return -1;
   }
   REUSABLE_ARRAY_HANDLESCOPE(isolate);
   REUSABLE_FIELD_HANDLESCOPE(isolate);
   REUSABLE_STRING_HANDLESCOPE(isolate);
   Array& fields_array = isolate->ArrayHandle();
   Field& field = isolate->FieldHandle();
@@ skipping 5454 matching lines @@
                                           true,   // is_static
                                           false,  // is_final
                                           false,  // is_const
                                           cls,
                                           token_pos));
   field.set_type(Type::Handle(Type::DynamicType()));
   field.set_value(Array::empty_array());
   GrowableObjectArray& metadata =
       GrowableObjectArray::Handle(this->metadata());
   metadata.Add(field, Heap::kOld);
+  cls.AddField(field);
 }
 
 
 void Library::AddClassMetadata(const Class& cls,
                                const Class& toplevel_class,
                                intptr_t token_pos) const {
   // We use the toplevel class as the owner of a class's metadata field because
   // a class's metadata is in scope of the library, not the class.
   AddMetadata(toplevel_class,
               String::Handle(MakeClassMetaName(cls)),
@@ skipping 1353 matching lines @@
   ASSERT(Field::Handle(metadata_field()).IsNull());
   Field& field = Field::Handle(Field::New(Symbols::TopLevel(),
                                           true,   // is_static
                                           false,  // is_final
                                           false,  // is_const
                                           owner_class,
                                           token_pos));
   field.set_type(Type::Handle(Type::DynamicType()));
   field.set_value(Array::empty_array());
   set_metadata_field(field);
+  owner_class.AddField(field);
 }
 
 
 RawObject* Namespace::GetMetadata() const {
   Field& field = Field::Handle(metadata_field());
   if (field.IsNull()) {
     // There is no metadata for this object.
     return Object::empty_array().raw();
   }
   Object& metadata = Object::Handle();
@@ skipping 9133 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart