Index: pkg/compiler/lib/src/resolution/type_resolver.dart |
diff --git a/pkg/compiler/lib/src/resolution/type_resolver.dart b/pkg/compiler/lib/src/resolution/type_resolver.dart |
index 0c9ae4261dc8b6746f79dff1e56bea3cf3207927..529c1fe5b466d81befc2642f82136a40cce5dd56 100644 |
--- a/pkg/compiler/lib/src/resolution/type_resolver.dart |
+++ b/pkg/compiler/lib/src/resolution/type_resolver.dart |
@@ -18,6 +18,7 @@ import '../elements/elements.dart' |
TypedefElement, |
TypeVariableElement; |
import '../elements/modelx.dart' show ErroneousElementX; |
+import '../elements/types.dart' show DartType, TypeVariableType; |
import '../resolution/resolution.dart'; |
import '../tree/tree.dart'; |
import '../universe/feature.dart' show Feature; |
@@ -409,8 +410,11 @@ class TypeResolver { |
/// Checks the type arguments of [type] against the type variable bounds. |
void checkTypeVariableBounds(NominalTypeAnnotation node, GenericType type) { |
- void checkTypeVariableBound(_, ResolutionDartType typeArgument, |
- ResolutionTypeVariableType typeVariable, ResolutionDartType bound) { |
+ void checkTypeVariableBound(_, DartType _typeArgument, |
+ TypeVariableType _typeVariable, DartType _bound) { |
+ ResolutionDartType typeArgument = _typeArgument; |
+ ResolutionTypeVariableType typeVariable = _typeVariable; |
+ ResolutionDartType bound = _bound; |
if (!types.isSubtype(typeArgument, bound)) { |
reporter.reportWarningMessage( |
node, MessageKind.INVALID_TYPE_VARIABLE_BOUND, { |