Patches to support Dart VM patch files in dart2js.

pkg/compiler/lib/src/compiler.dart

 // 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.
 
 library dart2js.compiler_base;
 
 import 'dart:async' show EventSink, Future;
 
 import '../compiler_new.dart' as api;
 import 'cache_strategy.dart' show CacheStrategy;
@@ skipping 347 matching lines @@
       serialization = new SerializationTask(this),
       libraryLoader = new LibraryLoaderTask(
           this,
           new _ResolvedUriTranslator(this),
           new _ScriptLoader(this),
           new _ElementScanner(scanner),
           this.serialization,
           this,
           environment),
       parser = new ParserTask(this, parsing.parserOptions),
-      patchParser = new PatchParserTask(this, parsing.parserOptions),
+      patchParser = createPatchParserTask(),
       resolver = createResolverTask(),
       closureToClassMapper = new closureMapping.ClosureTask(this),
       checker = new TypeCheckerTask(this),
       typesTask = new ti.TypesTask(this),
       constants = backend.constantCompilerTask,
       deferredLoadTask = new DeferredLoadTask(this),
-      mirrorUsageAnalyzerTask = new MirrorUsageAnalyzerTask(this),
+      mirrorUsageAnalyzerTask = createMirrorUsageAnalyzerTask(),
       enqueuer = backend.makeEnqueuer(),
       dumpInfoTask = new DumpInfoTask(this),
       reuseLibraryTask = new GenericTask('Reuse library', this),
       selfTask = new GenericTask('self', this),
     ];
 
     tasks.addAll(backend.tasks);
   }
 
   /// Creates the scanner task.
   ///
   /// Override this to mock the scanner for testing.
   ScannerTask createScannerTask() => new ScannerTask(this, dietParser,
       preserveComments: options.preserveComments, commentMap: commentMap);
 
   /// Creates the resolver task.
   ///
   /// Override this to mock the resolver for testing.
   ResolverTask createResolverTask() {
     return new ResolverTask(this, backend.constantCompilerTask);
   }
 
+  PatchParserTask createPatchParserTask() {
+    return new PatchParserTask(this, parsing.parserOptions);
+  }
+
+  MirrorUsageAnalyzerTask createMirrorUsageAnalyzerTask() {
+    return new MirrorUsageAnalyzerTask(this);
+  }
+
   Universe get resolverWorld => enqueuer.resolution.universe;
   Universe get codegenWorld => enqueuer.codegen.universe;
 
   bool get analyzeAll => options.analyzeAll || compileAll;
 
   bool get compileAll => false;
 
   bool get disableTypeInference =>
       options.disableTypeInference || compilationFailed;
 
@@ skipping 44 matching lines @@
   /// been scanned.
   ///
   /// Use this callback method to store references to specific member declared
   /// in certain libraries. Note that [library] has not been patched yet, nor
   /// has its imports/exports been resolved.
   ///
   /// Use [loader] to register the creation and scanning of a patch library
   /// for [library].
   Future onLibraryScanned(LibraryElement library, LibraryLoader loader) {
     Uri uri = library.canonicalUri;
-    if (uri == Uris.dart_core) {
+    if (library.compilationUnit.script.isSynthesized) {
+      // Ignore.
+    } else if (uri == Uris.dart_core) {
       initializeCoreClasses();
       identicalFunction = coreLibrary.find('identical');
     } else if (uri == Uris.dart__internal) {
       symbolImplementationClass = findRequiredElement(library, 'Symbol');
     } else if (uri == Uris.dart_mirrors) {
       mirrorSystemClass = findRequiredElement(library, 'MirrorSystem');
       mirrorsUsedClass = findRequiredElement(library, 'MirrorsUsed');
     } else if (uri == Uris.dart_async) {
       asyncLibrary = library;
       deferredLibraryClass = findRequiredElement(library, 'DeferredLibrary');
@@ skipping 571 matching lines @@
       }
     }
     reporter.log('Excess resolution work: ${resolved.length}.');
     for (Element e in resolved) {
       reporter.reportWarningMessage(e, MessageKind.GENERIC,
           {'text': 'Warning: $e resolved but not compiled.'});
     }
   }
 
   WorldImpact analyzeElement(Element element)
-      => selfTask.measureSubtask("Compiler.analyzeElement", () {
+      => selfTask.measureSubtaskElement("Compiler.analyzeElement", element, () {
     assert(invariant(
         element,
         element.impliesType ||
             element.isField ||
             element.isFunction ||
             element.isConstructor ||
             element.isGetter ||
             element.isSetter,
         message: 'Unexpected element kind: ${element.kind}'));
     assert(invariant(element, element is AnalyzableElement,
         message: 'Element $element is not analyzable.'));
     assert(invariant(element, element.isDeclaration));
     return resolution.computeWorldImpact(element);
   });
 
   WorldImpact analyze(ResolutionWorkItem work,
                       ResolutionEnqueuer world)
-      => selfTask.measureSubtask("Compiler.analyze", () {
+      => selfTask.measureSubtaskElement("Compiler.analyze", work.element, () {
     assert(invariant(work.element, identical(world, enqueuer.resolution)));
     assert(invariant(work.element, !work.isAnalyzed,
         message: 'Element ${work.element} has already been analyzed'));
     if (shouldPrintProgress) {
       // TODO(ahe): Add structured diagnostics to the compiler API and
       // use it to separate this from the --verbose option.
       if (phase == PHASE_RESOLVING) {
         reporter.log('Resolved ${enqueuer.resolution.processedElements.length} '
             'elements.');
         progress.reset();
@@ skipping 607 matching lines @@
             currentElement.enclosingClass.isEnumClass) {
           // Enums ASTs are synthesized (and give messed up messages).
           return true;
         }
 
         if (currentElement is AstElement) {
           AstElement astElement = currentElement;
           if (astElement.hasNode) {
             Token from = astElement.node.getBeginToken();
             Token to = astElement.node.getEndToken();
-            if (astElement.metadata.isNotEmpty) {
-              from = astElement.metadata.first.beginToken;
+            for (MetadataAnnotation annotation in astElement.metadata) {
+              // For patched elements, metadata contains annotations from both
+              // origin and patch. Search for the first annotation from this
+              // element. For example, if origin class is @Deprecated.
+              if (annotation.annotatedElement == currentElement) {
+                from = annotation.beginToken;
+                break;
+              }
             }
             return validateToken(from, to);
           }
         }
         return true;
       }, message: "Invalid current element: $currentElement [$begin,$end]."));
     }
     return new SourceSpan.fromTokens(uri, begin, end);
   }
 
@@ skipping 415 matching lines @@
   _ElementScanner(this.scanner);
   void scanLibrary(LibraryElement library) => scanner.scanLibrary(library);
   void scanUnit(CompilationUnitElement unit) => scanner.scan(unit);
 }
 
 class _EmptyEnvironment implements Environment {
   const _EmptyEnvironment();
 
   String valueOf(String key) => null;
 }