Changes to mirrors in support of metadata access at runtime. Assumes VM changes in flight.…

tests/lib/mirrors/metadata_test.dart

 // Copyright (c) 2013, 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.
 
-@string @symbol
 library test.metadata_test;
 
 import 'dart:mirrors';
 
 const string = 'a metadata string';
 
 const symbol = const Symbol('symbol');
 
 const hest = 'hest';
 
@@ skipping 28 matching lines @@
 
 @symbol @string @symbol
 main() {
   if (MirrorSystem.getName(symbol) != 'symbol') {
     // This happened in dart2js due to how early library metadata is
     // computed.
     throw 'Bad constant: $symbol';
   }
 
   MirrorSystem mirrors = currentMirrorSystem();
-  checkMetadata(mirrors.findLibrary(const Symbol('test.metadata_test')).first,
-                [string, symbol]);
   ClassMirror myClassMirror = reflectClass(MyClass);
   checkMetadata(myClassMirror, [symbol, string]);
-  ClosureMirror closure = reflect(main);
-  checkMetadata(closure.function, [symbol, string, symbol]);
-  closure = reflect(new MyClass().myMethod);
-  checkMetadata(closure.function, [string, symbol, string]);
+  LibraryMirror lib = mirrors.findLibrary(const Symbol('test.metadata_test')).first;
+  MethodMirror function = lib.functions[const Symbol('main')];
+  checkMetadata(function, [symbol, string, symbol]);
+  MethodMirror method = myClassMirror.methods[const Symbol('myMethod')];
+  checkMetadata(method, [string, symbol, string]);
 
   VariableMirror xMirror = myClassMirror.variables[const Symbol('x')];
   checkMetadata(xMirror, [hest, hest, symbol]);
 
   VariableMirror yMirror = myClassMirror.variables[const Symbol('y')];
   checkMetadata(yMirror, []);
 
   // TODO(ahe): Test local functions.
 }