Put metadata fields in their owner class.

runtime/vm/parser.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/parser.h"
 
 #include "lib/invocation_mirror.h"
 #include "platform/utils.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 4029 matching lines @@
   }
   ExpectToken(Token::kRBRACE);
 
   CheckConstructors(&members);
 
   // Need to compute this here since MakeArray() will clear the
   // functions array in members.
   const bool need_implicit_constructor =
       !members.has_constructor() && !cls.is_patch();
 
-  Array& array = Array::Handle();
-  array = Array::MakeArray(members.fields());
-  cls.SetFields(array);
+  cls.AddFields(members.fields());
 
   // Creating a new array for functions marks the class as parsed.
-  array = Array::MakeArray(members.functions());
+  const Array& array = Array::Handle(Array::MakeArray(members.functions()));
   cls.SetFunctions(array);
 
   // Add an implicit constructor if no explicit constructor is present.
   // No implicit constructors are needed for patch classes.
   if (need_implicit_constructor) {
     AddImplicitConstructor(cls);
   }
 
   if (cls.is_patch()) {
     // Apply the changes to the patched class looked up above.
@@ skipping 1187 matching lines @@
       } else if (IsTopLevelAccessor()) {
         ParseTopLevelAccessor(&top_level, metadata_pos);
       } else if (CurrentToken() == Token::kEOS) {
         break;
       } else {
         UnexpectedToken();
       }
     }
   }
   if ((top_level.fields.Length() > 0) || (top_level.functions.Length() > 0)) {
-    Array& array = Array::Handle();
+    toplevel_class.AddFields(top_level.fields);
 
-    array = Array::MakeArray(top_level.fields);
-    toplevel_class.SetFields(array);
-
-    array = Array::MakeArray(top_level.functions);
+    const Array& array = Array::Handle(Array::MakeArray(top_level.functions));
     toplevel_class.SetFunctions(array);
 
     library_.AddAnonymousClass(toplevel_class);
     pending_classes.Add(toplevel_class, Heap::kOld);
   }
 }
 
 
 void Parser::ChainNewBlock(LocalScope* outer_scope) {
   Block* block = new Block(current_block_,
@@ skipping 5675 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart