| Index: pkg/compiler/lib/src/js_backend/mirrors_analysis.dart
|
| diff --git a/pkg/compiler/lib/src/js_backend/mirrors_analysis.dart b/pkg/compiler/lib/src/js_backend/mirrors_analysis.dart
|
| index c66c8f1d0a116168e3c28f7cadfb4e2ff6645834..5207421c61be4b65eb5327cf29c904f425171863 100644
|
| --- a/pkg/compiler/lib/src/js_backend/mirrors_analysis.dart
|
| +++ b/pkg/compiler/lib/src/js_backend/mirrors_analysis.dart
|
| @@ -8,6 +8,7 @@ import '../common.dart';
|
| import '../common/resolution.dart';
|
| import '../diagnostics/diagnostic_listener.dart';
|
| import '../elements/elements.dart';
|
| +import '../elements/entities.dart';
|
| import '../universe/selector.dart';
|
| import '../universe/use.dart';
|
| import '../universe/world_impact.dart';
|
| @@ -24,8 +25,8 @@ class MirrorsAnalysis {
|
| /// Compute the impact for elements that are matched by the mirrors used
|
| /// annotation or, in lack thereof, all elements.
|
| WorldImpact computeImpactForReflectiveElements(
|
| - Iterable<ClassElement> recents,
|
| - Iterable<ClassElement> processedClasses,
|
| + Iterable<ClassEntity> recents,
|
| + Iterable<ClassEntity> processedClasses,
|
| Iterable<LibraryElement> loadedLibraries,
|
| {bool forResolution}) {
|
| MirrorsHandler handler = forResolution ? resolutionHandler : codegenHandler;
|
| @@ -135,7 +136,7 @@ class MirrorsHandler {
|
| /// [enclosingWasIncluded] provides a hint whether the enclosing element was
|
| /// needed for reflection.
|
| void _enqueueReflectiveElementsInClass(
|
| - ClassElement cls, Iterable<ClassElement> recents,
|
| + ClassElement cls, Iterable<ClassEntity> recents,
|
| {bool enclosingWasIncluded}) {
|
| if (cls.library.isInternalLibrary || cls.isInjected) return;
|
| bool includeClass = _shouldIncludeElementDueToMirrors(cls,
|
| @@ -184,7 +185,7 @@ class MirrorsHandler {
|
| /// Enqeue all local members of the library [lib] if they are required for
|
| /// reflection.
|
| void _enqueueReflectiveElementsInLibrary(
|
| - LibraryElement lib, Iterable<ClassElement> recents) {
|
| + LibraryElement lib, Iterable<ClassEntity> recents) {
|
| bool includeLibrary =
|
| _shouldIncludeElementDueToMirrors(lib, includedEnclosing: false);
|
| lib.forEachLocalMember((Element member) {
|
| @@ -207,8 +208,8 @@ class MirrorsHandler {
|
| /// annotation or, in lack thereof, all elements.
|
| // TODO(johnniwinther): Compute [WorldImpact] instead of enqueuing directly.
|
| void enqueueReflectiveElements(
|
| - Iterable<ClassElement> recents,
|
| - Iterable<ClassElement> processedClasses,
|
| + Iterable<ClassEntity> recents,
|
| + Iterable<ClassEntity> processedClasses,
|
| Iterable<LibraryElement> loadedLibraries) {
|
| if (!hasEnqueuedReflectiveElements) {
|
| _logEnqueueReflectiveAction("!START enqueueAll");
|
|
|