Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(602)

Unified Diff: runtime/vm/object.cc

Issue 269253005: Put metadata fields in their owner class. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index eacee907452c9dd40ac41472c7affd274327a0f1..ee749542c7fa05f7076f98638671ad35a7b75f7d 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -2794,6 +2794,30 @@ void Class::SetFields(const Array& value) const {
}
+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 s
rmacnak 2014/05/08 18:14:54 This path will only be hit when we encounter metad
+ 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 memb
+ 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()) {
@@ -8268,6 +8292,7 @@ void Library::AddMetadata(const Class& cls,
GrowableObjectArray& metadata =
GrowableObjectArray::Handle(this->metadata());
metadata.Add(field, Heap::kOld);
+ cls.AddField(field);
}
@@ -9641,6 +9666,7 @@ void Namespace::AddMetadata(intptr_t token_pos, const Class& owner_class) {
field.set_type(Type::Handle(Type::DynamicType()));
field.set_value(Array::empty_array());
set_metadata_field(field);
+ owner_class.AddField(field);
}
« runtime/vm/class_finalizer.cc ('K') | « runtime/vm/object.h ('k') | runtime/vm/parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698