Chromium Code Reviews| Index: pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart |
| diff --git a/pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart b/pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart |
| index 307857286ca4c930a02cee95839521a828580d82..f1eeba9f443786046f030aa465ef7a013701b79c 100644 |
| --- a/pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart |
| +++ b/pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart |
| @@ -47,10 +47,6 @@ abstract class InferrerEngine<T, V extends TypeSystem> |
| CoreTypes get coreTypes => compiler.coreTypes; |
| - ResolvedAst getResolvedAst(Element element) { |
| - return compiler.backend.frontend.getResolvedAst(element.declaration); |
| - } |
| - |
| /** |
| * Records the default type of parameter [parameter]. |
| */ |
| @@ -268,7 +264,7 @@ abstract class InferrerEngine<T, V extends TypeSystem> |
| throw "updateSelector for IR node $node"; |
| } |
| ast.Node astNode = node; |
| - TreeElements elements = getResolvedAst(owner).elements; |
| + TreeElements elements = owner.resolvedAst.elements; |
| if (astNode.asSendSet() != null) { |
| if (selector.isSetter || selector.isIndexSet) { |
| elements.setTypeMask(node, mask); |
| @@ -359,12 +355,8 @@ class SimpleTypeInferrerVisitor<T> |
| compiler, |
| handler); |
| - ResolvedAst getResolvedAst(Element element) { |
| - return compiler.backend.frontend.getResolvedAst(element.declaration); |
| - } |
| - |
| - void analyzeSuperConstructorCall(Element target, ArgumentsTypes arguments) { |
| - ResolvedAst resolvedAst = getResolvedAst(target); |
| + void analyzeSuperConstructorCall(AstElement target, ArgumentsTypes arguments) { |
|
Siggi Cherem (dart-lang)
2016/05/13 19:43:50
nit: dartfmt
Johnni Winther
2016/05/17 11:59:51
Done.
|
| + ResolvedAst resolvedAst = target.resolvedAst; |
| inferrer.analyze(resolvedAst, arguments); |
| isThisExposed = isThisExposed || inferrer.checkIfExposesThis(target); |
| } |
| @@ -487,7 +479,7 @@ class SimpleTypeInferrerVisitor<T> |
| cls.forEachInstanceField((_, FieldElement field) { |
| if (field.isFinal) return; |
| T type = locals.fieldScope.readField(field); |
| - ResolvedAst resolvedAst = getResolvedAst(field); |
| + ResolvedAst resolvedAst = field.resolvedAst; |
| if (type == null && resolvedAst.body == null) { |
| inferrer.recordTypeOfNonFinalField( |
| spannable, field, types.nullType); |
| @@ -565,7 +557,7 @@ class SimpleTypeInferrerVisitor<T> |
| LocalsHandler closureLocals = |
| new LocalsHandler<T>.from(locals, node, useOtherTryBlock: false); |
| SimpleTypeInferrerVisitor visitor = new SimpleTypeInferrerVisitor<T>( |
| - element, getResolvedAst(element), compiler, inferrer, closureLocals); |
| + element, element.resolvedAst, compiler, inferrer, closureLocals); |
| visitor.run(); |
| inferrer.recordReturnType(element, visitor.returnType); |
| @@ -667,7 +659,7 @@ class SimpleTypeInferrerVisitor<T> |
| if (isThisExposed) return; |
| inferrer.forEachElementMatching(selector, mask, (element) { |
| if (element.isField) { |
| - ResolvedAst elementResolvedAst = getResolvedAst(element); |
| + ResolvedAst elementResolvedAst = element.resolvedAst; |
| if (!selector.isSetter && |
| isInClassOrSubclass(element) && |
| !element.isFinal && |