| Index: sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart b/sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart
|
| index 4a7a5090cac290ed8ca66a7a1c8f7f2efb3aa054..2bd09520176e467cf4a1899cb5dc58d7a0934ef0 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/types/flat_type_mask.dart
|
| @@ -440,13 +440,13 @@ class FlatTypeMask implements TypeMask {
|
| // TODO(kasperl): Can't we just avoid creating typed selectors
|
| // based of function types?
|
| Element self = base;
|
| - if (self.isTypedef()) {
|
| + if (self.isTypedef) {
|
| // A typedef is a function type that doesn't have any
|
| // user-defined members.
|
| return false;
|
| }
|
|
|
| - ClassElement other = element.getEnclosingClass();
|
| + ClassElement other = element.enclosingClass;
|
| if (compiler.backend.isNullImplementation(other)) {
|
| return isNullable;
|
| } else if (isExact) {
|
| @@ -484,7 +484,7 @@ class FlatTypeMask implements TypeMask {
|
| if (element == null) return false;
|
|
|
| if (element.isAbstract) {
|
| - ClassElement enclosingClass = element.getEnclosingClass();
|
| + ClassElement enclosingClass = element.enclosingClass;
|
| return hasConcreteMatch(enclosingClass.superclass, selector, compiler);
|
| }
|
| return selector.appliesUntyped(element, compiler);
|
| @@ -566,7 +566,7 @@ class FlatTypeMask implements TypeMask {
|
| Iterable<Element> targets = compiler.world.allFunctions.filter(selector);
|
| if (targets.length != 1) return null;
|
| Element result = targets.first;
|
| - ClassElement enclosing = result.getEnclosingClass();
|
| + ClassElement enclosing = result.enclosingClass;
|
| // We only return the found element if it is guaranteed to be
|
| // implemented on the exact receiver type. It could be found in a
|
| // subclass or in an inheritance-wise unrelated class in case of
|
|
|