| Index: pkg/analyzer/lib/src/generated/error_verifier.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
|
| index c99057ad123a0ffe0645274036a38d55461dfbe9..90392b78feccd14fb920e6cef7e9113567bb13c2 100644
|
| --- a/pkg/analyzer/lib/src/generated/error_verifier.dart
|
| +++ b/pkg/analyzer/lib/src/generated/error_verifier.dart
|
| @@ -1404,7 +1404,7 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
|
| // an error message once it's ready to "return false".
|
| if (!overridingFT.typeFormals.isEmpty) {
|
| if (overriddenFT.typeFormals.isEmpty) {
|
| - overriddenFT = _typeSystem.instantiateToBounds(overriddenFT);
|
| + overridingFT = _typeSystem.instantiateToBounds(overridingFT);
|
| } else {
|
| List<TypeParameterElement> params1 = overridingFT.typeFormals;
|
| List<TypeParameterElement> params2 = overriddenFT.typeFormals;
|
| @@ -4571,6 +4571,10 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
|
| FunctionType requiredMemberFT = _inheritanceManager
|
| .substituteTypeArgumentsInMemberFromInheritance(
|
| requiredMemberType, memberName, enclosingType);
|
| + foundConcreteFT =
|
| + _typeSystem.typeToConcreteType(_typeProvider, foundConcreteFT);
|
| + requiredMemberFT =
|
| + _typeSystem.typeToConcreteType(_typeProvider, requiredMemberFT);
|
| if (_typeSystem.isSubtypeOf(foundConcreteFT, requiredMemberFT)) {
|
| continue;
|
| }
|
|
|