VM: Evaluate metadata on a class in the scope of its library not the scope of the 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 8015 matching lines @@
                                           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);
 }
 
 
-void Library::AddClassMetadata(const Class& cls, intptr_t token_pos) const {
-  AddMetadata(cls, String::Handle(MakeClassMetaName(cls)), token_pos);
+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)),
+              token_pos);
 }
 
 
 void Library::AddFieldMetadata(const Field& field,
                                intptr_t token_pos) const {
   AddMetadata(Class::Handle(field.origin()),
               String::Handle(MakeFieldMetaName(field)),
               token_pos);
 }
 
@@ skipping 10169 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart