| Index: pkg/compiler/lib/src/resolution/resolution.dart
|
| diff --git a/pkg/compiler/lib/src/resolution/resolution.dart b/pkg/compiler/lib/src/resolution/resolution.dart
|
| index f7554e5c3af0ec5bbffd24c688068f9a39b9c0b0..2f5a6178bc8ae570eafc59a70d291b9d0cb49f0c 100644
|
| --- a/pkg/compiler/lib/src/resolution/resolution.dart
|
| +++ b/pkg/compiler/lib/src/resolution/resolution.dart
|
| @@ -10,7 +10,8 @@ import '../common/names.dart' show
|
| Identifiers;
|
| import '../common/resolution.dart' show
|
| Parsing,
|
| - Resolution;
|
| + Resolution,
|
| + ResolutionWorldImpact;
|
| import '../common/tasks.dart' show
|
| CompilerTask,
|
| DeferredAction;
|
| @@ -77,14 +78,14 @@ class ResolverTask extends CompilerTask {
|
|
|
| Parsing get parsing => compiler.parsing;
|
|
|
| - WorldImpact resolve(Element element) {
|
| + ResolutionWorldImpact resolve(Element element) {
|
| return measure(() {
|
| if (Elements.isErroneous(element)) {
|
| // TODO(johnniwinther): Add a predicate for this.
|
| assert(invariant(element, element is! ErroneousElement,
|
| message: "Element $element expected to have parse errors."));
|
| _ensureTreeElements(element);
|
| - return const WorldImpact();
|
| + return const ResolutionWorldImpact();
|
| }
|
|
|
| WorldImpact processMetadata([WorldImpact result]) {
|
| @@ -108,7 +109,7 @@ class ResolverTask extends CompilerTask {
|
| if (element.isClass) {
|
| ClassElement cls = element;
|
| cls.ensureResolved(resolution);
|
| - return processMetadata(const WorldImpact());
|
| + return processMetadata(const ResolutionWorldImpact());
|
| } else if (element.isTypedef) {
|
| TypedefElement typdef = element;
|
| return processMetadata(resolveTypedef(typdef));
|
| @@ -286,13 +287,13 @@ class ResolverTask extends CompilerTask {
|
| WorldImpact resolveMethodElement(FunctionElementX element) {
|
| assert(invariant(element, element.isDeclaration));
|
| return reporter.withCurrentElement(element, () {
|
| - if (compiler.enqueuer.resolution.hasBeenResolved(element)) {
|
| + if (compiler.enqueuer.resolution.hasBeenProcessed(element)) {
|
| // TODO(karlklose): Remove the check for [isConstructor]. [elememts]
|
| // should never be non-null, not even for constructors.
|
| assert(invariant(element, element.isConstructor,
|
| message: 'Non-constructor element $element '
|
| 'has already been analyzed.'));
|
| - return const WorldImpact();
|
| + return const ResolutionWorldImpact();
|
| }
|
| if (element.isSynthesized) {
|
| if (element.isGenerativeConstructor) {
|
| @@ -312,7 +313,7 @@ class ResolverTask extends CompilerTask {
|
| } else {
|
| assert(element.isDeferredLoaderGetter || element.isErroneous);
|
| _ensureTreeElements(element);
|
| - return const WorldImpact();
|
| + return const ResolutionWorldImpact();
|
| }
|
| } else {
|
| element.parseNode(resolution.parsing);
|
| @@ -717,7 +718,7 @@ class ResolverTask extends CompilerTask {
|
| // mixin application has been performed.
|
| // TODO(johnniwinther): Obtain the [TreeElements] for [member]
|
| // differently.
|
| - if (compiler.enqueuer.resolution.hasBeenResolved(member)) {
|
| + if (compiler.enqueuer.resolution.hasBeenProcessed(member)) {
|
| checkMixinSuperUses(
|
| member.resolvedAst.elements,
|
| mixinApplication,
|
| @@ -994,7 +995,7 @@ class ResolverTask extends CompilerTask {
|
| }
|
|
|
| WorldImpact resolveTypedef(TypedefElementX element) {
|
| - if (element.isResolved) return const WorldImpact();
|
| + if (element.isResolved) return const ResolutionWorldImpact();
|
| compiler.world.allTypedefs.add(element);
|
| return _resolveTypeDeclaration(element, () {
|
| ResolutionRegistry registry = new ResolutionRegistry(
|
| @@ -1042,7 +1043,7 @@ class ResolverTask extends CompilerTask {
|
| // and the annotated element instead. This will allow the backend to
|
| // retrieve the backend constant and only register metadata on the
|
| // elements for which it is needed. (Issue 17732).
|
| - registry.registerMetadataConstant(annotation, annotatedElement);
|
| + registry.registerMetadataConstant(annotation);
|
| annotation.resolutionState = STATE_DONE;
|
| }));
|
| }
|
|
|