Index: sdk/lib/_internal/compiler/implementation/inferrer/type_graph_inferrer.dart |
diff --git a/sdk/lib/_internal/compiler/implementation/inferrer/type_graph_inferrer.dart b/sdk/lib/_internal/compiler/implementation/inferrer/type_graph_inferrer.dart |
index 53bea15a48c1eaef70aad167122b7c0163c56791..355ca78352819ae6c7db7404785dc6567f47c325 100644 |
--- a/sdk/lib/_internal/compiler/implementation/inferrer/type_graph_inferrer.dart |
+++ b/sdk/lib/_internal/compiler/implementation/inferrer/type_graph_inferrer.dart |
@@ -215,14 +215,13 @@ class TypeInformationSystem extends TypeSystem<TypeInformation> { |
if (annotation.isVoid) return nullType; |
if (annotation.element == compiler.objectClass) return type; |
TypeMask otherType; |
- if (annotation.kind == TypeKind.TYPEDEF || |
- annotation.kind == TypeKind.FUNCTION) { |
+ if (annotation.isTypedef || annotation.isFunctionType) { |
otherType = functionType.type; |
- } else if (annotation.kind == TypeKind.TYPE_VARIABLE) { |
+ } else if (annotation.isTypeVariable) { |
// TODO(ngeoffray): Narrow to bound. |
return type; |
} else { |
- assert(annotation.kind == TypeKind.INTERFACE); |
+ assert(annotation.isInterfaceType); |
otherType = new TypeMask.nonNullSubtype(annotation.element); |
} |
if (isNullable) otherType = otherType.nullable(); |