Make JavaScriptBackend.processAnnotations element-model agnostic

pkg/compiler/lib/src/js_backend/backend.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 js_backend.backend;
 
 import '../common.dart';
 import '../common/backend_api.dart'
     show ForeignResolver, NativeRegistry, ImpactTransformer;
 import '../common/codegen.dart' show CodegenImpact, CodegenWorkItem;
@@ skipping 460 matching lines @@
     }
   }
 
   JavaScriptBackend(this.compiler,
       {bool generateSourceMap: true,
       bool useStartupEmitter: false,
       bool useMultiSourceInfo: false,
       bool useNewSourceInfo: false,
       bool useKernel: false})
       : _rti = new _RuntimeTypes(compiler),
-        annotations = new OptimizerHintsForTests(compiler),
+        annotations = new OptimizerHintsForTests(

[Siggi Cherem (dart-lang), 2017/05/02 20:04:22]

ditto

[Johnni Winther, 2017/05/03 08:05:59]

Done.

+            compiler.elementEnvironment, compiler.commonElements),
         this.sourceInformationStrategy = createSourceInformationStrategy(
             generateSourceMap: generateSourceMap,
             useMultiSourceInfo: useMultiSourceInfo,
             useNewSourceInfo: useNewSourceInfo),
         constantCompilerTask = new JavaScriptConstantTask(compiler),
         _nativeDataResolver = new NativeDataResolverImpl(compiler),
         _rtiNeedBuilder =
             compiler.frontEndStrategy.createRuntimeTypesNeedBuilder() {
     _target = new JavaScriptBackendTarget(this);
     impacts = new BackendImpacts(compiler.options, commonElements);
@@ skipping 680 matching lines @@
   bool isTargetSpecificLibrary(LibraryElement library) {
     Uri canonicalUri = library.canonicalUri;
     if (canonicalUri == Uris.dart__js_helper ||
         canonicalUri == Uris.dart__interceptors) {
       return true;
     }
     return false;
   }
 
   /// Process backend specific annotations.
+  // TODO(johnniwinther): Merge this with [AnnotationProcessor] and use
+  // [ElementEnvironment.getMemberMetadata] in [AnnotationProcessor].
   void processAnnotations(
-      MemberElement element, ClosedWorldRefiner closedWorldRefiner) {
-    if (element.isMalformed) {
+      MemberEntity element, ClosedWorldRefiner closedWorldRefiner) {
+    if (element is MemberElement && element.isMalformed) {
       // Elements that are marked as malformed during parsing or resolution
       // might be registered here. These should just be ignored.
       return;
     }
 
     if (element.isFunction || element.isConstructor) {
-      MethodElement method = element.implementation;
-      if (annotations.noInline(method)) {
-        inlineCache.markAsNonInlinable(method);
+      if (annotations.noInline(element)) {
+        inlineCache.markAsNonInlinable(element);
       }
     }
     if (element.isField) return;
-    MethodElement method = element;
+    FunctionEntity method = element;
 
-    LibraryElement library = method.library;
-    if (!library.isPlatformLibrary && !canLibraryUseNative(library)) return;
+    LibraryEntity library = method.library;
+    if (library.canonicalUri.scheme != 'dart' &&
+        !canLibraryUseNative(library)) {
+      return;
+    }
     bool hasNoInline = false;
     bool hasForceInline = false;
     bool hasNoThrows = false;
     bool hasNoSideEffects = false;
-    for (MetadataAnnotation metadata in method.implementation.metadata) {
-      metadata.ensureResolved(resolution);
-      ConstantValue constantValue =
-          compiler.constants.getConstantValue(metadata.constant);
+    for (ConstantValue constantValue
+        in compiler.elementEnvironment.getMemberMetadata(method)) {
       if (!constantValue.isConstructedObject) continue;
       ObjectConstantValue value = constantValue;
-      ClassElement cls = value.type.element;
+      ClassEntity cls = value.type.element;
       if (cls == commonElements.forceInlineClass) {
         hasForceInline = true;
         if (VERBOSE_OPTIMIZER_HINTS) {
           reporter.reportHintMessage(
               method, MessageKind.GENERIC, {'text': "Must inline"});
         }
         inlineCache.markAsMustInline(method);
       } else if (cls == commonElements.noInlineClass) {
         hasNoInline = true;
         if (VERBOSE_OPTIMIZER_HINTS) {
           reporter.reportHintMessage(
               method, MessageKind.GENERIC, {'text': "Cannot inline"});
         }
         inlineCache.markAsNonInlinable(method);
       } else if (cls == commonElements.noThrowsClass) {
         hasNoThrows = true;
-        if (!Elements.isStaticOrTopLevelFunction(method) &&
-            !method.isFactoryConstructor) {
+        bool isValid = true;
+        if (method.isTopLevel) {
+          isValid = true;
+        } else if (method.isStatic) {
+          isValid = true;
+        } else if (method is ConstructorEntity && method.isFactoryConstructor) {
+          isValid = true;
+        }
+        if (!isValid) {
           reporter.internalError(
               method,
               "@NoThrows() is currently limited to top-level"
               " or static functions and factory constructors.");
         }
         if (VERBOSE_OPTIMIZER_HINTS) {
           reporter.reportHintMessage(
               method, MessageKind.GENERIC, {'text': "Cannot throw"});
         }
         closedWorldRefiner.registerCannotThrow(method);
@@ skipping 206 matching lines @@
 
   bool canUseAliasedSuperMember(MemberEntity member, Selector selector) {
     return !selector.isGetter;
   }
 
   /// Returns `true` if [member] is called from a subclass via `super`.
   bool isAliasedSuperMember(MemberEntity member) {
     return _aliasedSuperMembers.contains(member);
   }
 }