Use Entity in native_data.

pkg/compiler/lib/src/js_backend/native_data.dart

 // Copyright (c) 2016, 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.native_data;
 
 import '../common.dart';
-import '../elements/elements.dart' show ClassElement;
+import '../common_elements.dart' show ElementEnvironment;
 import '../elements/entities.dart';
 import '../native/behavior.dart' show NativeBehavior;
 import '../util/util.dart';
 
 /// Basic information for native classes and js-interop libraries and classes.
 ///
 /// This information is computed during loading using [NativeBasicDataBuilder].
 abstract class NativeBasicData {
   /// Returns `true` if [cls] corresponds to a native JavaScript class.
   ///
@@ skipping 80 matching lines @@
   void setNativeClassTagInfo(ClassEntity cls, String tagInfo);
 
   /// Marks [element] as an explicit part of JsInterop. The js interop name is
   /// expected to be computed later.
   void markAsJsInteropLibrary(LibraryEntity element);
 
   /// Marks [element] as an explicit part of JsInterop. The js interop name is
   /// expected to be computed later.
   void markAsJsInteropClass(ClassEntity element);
 
-  NativeBasicData close();
+  /// Creates the [NativeBasicData] object for the data collected in this
+  /// builder.
+  NativeBasicData close(ElementEnvironment environment);
 }
 
 abstract class NativeDataBuilder {
   /// Registers the [behavior] for calling the native [method].
   void setNativeMethodBehavior(FunctionEntity method, NativeBehavior behavior);
 
   /// Registers the [behavior] for reading from the native [field].
   void setNativeFieldLoadBehavior(FieldEntity field, NativeBehavior behavior);
 
   /// Registers the [behavior] for writing to the native [field].
@@ skipping 53 matching lines @@
   @override
   void markAsJsInteropLibrary(LibraryEntity element) {
     jsInteropLibraries.add(element);
   }
 
   @override
   void markAsJsInteropClass(ClassEntity element) {
     jsInteropClasses.add(element);
   }
 
-  NativeBasicData close() {
+  NativeBasicData close(ElementEnvironment environment) {
     return new NativeBasicDataImpl(
-        nativeClassTagInfo, jsInteropLibraries, jsInteropClasses);
+        environment, nativeClassTagInfo, jsInteropLibraries, jsInteropClasses);
   }
 }
 
 class NativeBasicDataImpl implements NativeBasicData {
+  final ElementEnvironment _env;
+
   /// Tag info for native JavaScript classes names. See
   /// [setNativeClassTagInfo].
   final Map<ClassEntity, NativeClassTag> nativeClassTagInfo;
 
   /// The JavaScript libraries implemented via typed JavaScript interop.
   final Set<LibraryEntity> jsInteropLibraries;
 
   /// The JavaScript classes implemented via typed JavaScript interop.
   final Set<ClassEntity> jsInteropClasses;
 
-  NativeBasicDataImpl(
-      this.nativeClassTagInfo, this.jsInteropLibraries, this.jsInteropClasses);
+  NativeBasicDataImpl(this._env, this.nativeClassTagInfo,
+      this.jsInteropLibraries, this.jsInteropClasses);
 
   /// Returns `true` if [cls] is a native class.
   bool isNativeClass(ClassEntity element) {
     if (isJsInteropClass(element)) return true;
     return nativeClassTagInfo.containsKey(element);
   }
 
   /// Returns the list of non-directive native tag words for [cls].
   List<String> getNativeTagsOfClass(ClassEntity cls) {
     return nativeClassTagInfo[cls].names;
   }
 
   /// Returns `true` if [cls] has a `!nonleaf` tag word.
   bool hasNativeTagsForcedNonLeaf(ClassEntity cls) {
     return nativeClassTagInfo[cls].isNonLeaf;
   }
 
   /// Returns `true` if [element] is explicitly marked as part of JsInterop.
   bool isJsInteropLibrary(LibraryEntity element) {
     return jsInteropLibraries.contains(element);
   }
 
   /// Returns `true` if [element] is explicitly marked as part of JsInterop.
   bool isJsInteropClass(ClassEntity element) {
     return jsInteropClasses.contains(element);
   }
 
   /// Returns `true` if [element] or any of its superclasses is native.
-  bool isNativeOrExtendsNative(ClassElement element) {
+  bool isNativeOrExtendsNative(ClassEntity element) {
     if (element == null) return false;
     if (isNativeClass(element) || isJsInteropClass(element)) {
       return true;
     }
-    assert(element.isResolved);
-    return isNativeOrExtendsNative(element.superclass);
+    return isNativeOrExtendsNative(_env.getSuperClass(element));
   }
 }
 
 class NativeDataImpl implements NativeDataBuilder, NativeData {
   /// Prefix used to escape JS names that are not valid Dart names
   /// when using JSInterop.
   static const String _jsInteropEscapePrefix = r'JS$';
 
   final NativeBasicData _nativeBasicData;
 
@@ skipping 284 matching lines @@
   int get hashCode => Hashing.listHash(names, isNonLeaf.hashCode);
 
   bool operator ==(other) {
     if (identical(this, other)) return true;
     if (other is! NativeClassTag) return false;
     return equalElements(names, other.names) && isNonLeaf == other.isNonLeaf;
   }
 
   String toString() => text;
 }