| Index: sdk/lib/_internal/compiler/implementation/inferrer/inferrer_visitor.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/inferrer/inferrer_visitor.dart b/sdk/lib/_internal/compiler/implementation/inferrer/inferrer_visitor.dart
|
| index cf49e902f4f52701b77d855a574f78f393c655bf..d078cfd8ae73734f8164145371867804d5cc7db6 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/inferrer/inferrer_visitor.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/inferrer/inferrer_visitor.dart
|
| @@ -612,12 +612,12 @@ abstract class InferrerVisitor
|
|
|
| bool get inLoop => loopLevel > 0;
|
| bool get isThisExposed {
|
| - return analyzedElement.isGenerativeConstructor()
|
| + return analyzedElement.isGenerativeConstructor
|
| ? locals.fieldScope.isThisExposed
|
| : true;
|
| }
|
| void set isThisExposed(value) {
|
| - if (analyzedElement.isGenerativeConstructor()) {
|
| + if (analyzedElement.isGenerativeConstructor) {
|
| locals.fieldScope.isThisExposed = value;
|
| }
|
| }
|
| @@ -634,7 +634,7 @@ abstract class InferrerVisitor
|
| if (handler != null) return;
|
| Node node = analyzedElement.parseNode(compiler);
|
| FieldInitializationScope<T> fieldScope =
|
| - analyzedElement.isGenerativeConstructor()
|
| + analyzedElement.isGenerativeConstructor
|
| ? new FieldInitializationScope<T>(types)
|
| : null;
|
| locals = new LocalsHandler<T>(inferrer, types, compiler, node, fieldScope);
|
| @@ -718,12 +718,12 @@ abstract class InferrerVisitor
|
|
|
| T visitLiteralList(LiteralList node) {
|
| node.visitChildren(this);
|
| - return node.isConst() ? types.constListType : types.growableListType;
|
| + return node.isConst ? types.constListType : types.growableListType;
|
| }
|
|
|
| T visitLiteralMap(LiteralMap node) {
|
| node.visitChildren(this);
|
| - return node.isConst() ? types.constMapType : types.mapType;
|
| + return node.isConst ? types.constMapType : types.mapType;
|
| }
|
|
|
| T visitLiteralNull(LiteralNull node) {
|
| @@ -744,14 +744,13 @@ abstract class InferrerVisitor
|
| bool isThisOrSuper(Node node) => node.isThis() || node.isSuper();
|
|
|
| Element get outermostElement {
|
| - return
|
| - analyzedElement.getOutermostEnclosingMemberOrTopLevel().implementation;
|
| + return analyzedElement.outermostEnclosingMemberOrTopLevel.implementation;
|
| }
|
|
|
| T _thisType;
|
| T get thisType {
|
| if (_thisType != null) return _thisType;
|
| - ClassElement cls = outermostElement.getEnclosingClass();
|
| + ClassElement cls = outermostElement.enclosingClass;
|
| if (compiler.world.isUsedAsMixin(cls)) {
|
| return _thisType = types.nonNullSubtype(cls);
|
| } else if (compiler.world.hasAnySubclass(cls)) {
|
| @@ -765,7 +764,7 @@ abstract class InferrerVisitor
|
| T get superType {
|
| if (_superType != null) return _superType;
|
| return _superType = types.nonNullExact(
|
| - outermostElement.getEnclosingClass().superclass);
|
| + outermostElement.enclosingClass.superclass);
|
| }
|
|
|
| T visitIdentifier(Identifier node) {
|
|
|