| Index: pkg/compiler/lib/src/elements/common.dart
|
| diff --git a/pkg/compiler/lib/src/elements/common.dart b/pkg/compiler/lib/src/elements/common.dart
|
| index b4b78616bd44408343083bacf0812a557bda8a2f..ddc8ddd0517e2b849b4d4fb1ab17f1246dd00324 100644
|
| --- a/pkg/compiler/lib/src/elements/common.dart
|
| +++ b/pkg/compiler/lib/src/elements/common.dart
|
| @@ -10,7 +10,8 @@ import '../common/names.dart' show Identifiers, Names, Uris;
|
| import '../core_types.dart' show CommonElements;
|
| import '../util/util.dart' show Link;
|
| import 'elements.dart';
|
| -import 'resolution_types.dart' show DartType, InterfaceType, FunctionType;
|
| +import 'resolution_types.dart'
|
| + show ResolutionDartType, ResolutionInterfaceType, ResolutionFunctionType;
|
|
|
| abstract class ElementCommon implements Element {
|
| @override
|
| @@ -188,13 +189,13 @@ abstract class CompilationUnitElementCommon implements CompilationUnitElement {}
|
|
|
| abstract class ClassElementCommon implements ClassElement {
|
| @override
|
| - Link<DartType> get allSupertypes => allSupertypesAndSelf.supertypes;
|
| + Link<ResolutionDartType> get allSupertypes => allSupertypesAndSelf.supertypes;
|
|
|
| @override
|
| int get hierarchyDepth => allSupertypesAndSelf.maxDepth;
|
|
|
| @override
|
| - InterfaceType asInstanceOf(ClassElement cls) {
|
| + ResolutionInterfaceType asInstanceOf(ClassElement cls) {
|
| if (cls == this) return thisType;
|
| return allSupertypesAndSelf.asInstanceOf(cls);
|
| }
|
| @@ -455,7 +456,7 @@ abstract class ClassElementCommon implements ClassElement {
|
| return false;
|
| }
|
|
|
| - FunctionType get callType {
|
| + ResolutionFunctionType get callType {
|
| MemberSignature member = lookupInterfaceMember(Names.call);
|
| return member != null && member.isMethod ? member.type : null;
|
| }
|
| @@ -497,7 +498,7 @@ abstract class ClassElementCommon implements ClassElement {
|
| }
|
|
|
| abstract class FunctionSignatureCommon implements FunctionSignature {
|
| - DartType get returnType => type.returnType;
|
| + ResolutionDartType get returnType => type.returnType;
|
|
|
| void forEachRequiredParameter(void function(Element parameter)) {
|
| requiredParameters.forEach(function);
|
|
|