Late night strong mode cleaning.

pkg/compiler/lib/src/elements/resolution_types.dart

Index: pkg/compiler/lib/src/elements/resolution_types.dart
diff --git a/pkg/compiler/lib/src/elements/resolution_types.dart b/pkg/compiler/lib/src/elements/resolution_types.dart
index cc309c1c568a0153a4f331c1c58177ae15431075..d37ef6be28ac0b1219f095fa8d70dd57ec52f8f1 100644
--- a/pkg/compiler/lib/src/elements/resolution_types.dart
+++ b/pkg/compiler/lib/src/elements/resolution_types.dart
@@ -367,7 +367,8 @@ class MalformedType extends ResolutionDartType {
   }
 }
 
-abstract class GenericType<T extends GenericType> extends ResolutionDartType {
+abstract class GenericType<T extends GenericType<T>>
+    extends ResolutionDartType {
   final TypeDeclarationElement element;
   final List<ResolutionDartType> typeArguments;
 
@@ -488,6 +489,7 @@ abstract class GenericType<T extends GenericType> extends ResolutionDartType {
   }
 }
 
+// ignore: INCONSISTENT_METHOD_INHERITANCE
 class ResolutionInterfaceType extends GenericType<ResolutionInterfaceType>
     implements InterfaceType {
   int _hashCode;
@@ -1374,7 +1376,8 @@ class Types extends DartTypes {
         ResolutionInterfaceType type, int depth) {
       OrderedTypeSet types = type.element.allSupertypesAndSelf;
       Set<ResolutionDartType> set = new Set<ResolutionDartType>();
-      types.forEach(depth, (ResolutionInterfaceType supertype) {
+      types.forEach(depth, (_supertype) {
+        ResolutionInterfaceType supertype = _supertype;
         set.add(supertype.substByContext(type));
       });
       return set;
@@ -1637,7 +1640,7 @@ class MoreSpecificSubtypeVisitor
     if (supertypeInstance == null) return null;
 
     constraintMap = new Map<ResolutionTypeVariableType, ResolutionDartType>();
-    element.typeVariables.forEach((ResolutionTypeVariableType typeVariable) {
+    element.typeVariables.forEach((ResolutionDartType typeVariable) {
       constraintMap[typeVariable] = const ResolutionDynamicType();
     });
     if (supertypeInstance.accept(this, supertype)) {