Report NO_COMBINED_SUPER_SIGNATURE.

dart-lang/language#975

Change-Id: I8ecd191efa84f17d36ea09ef1db33a401c67fda3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151093
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/error/error.dart

@@ -242,6 +242,7 @@ const List<ErrorCode> errorCodeValues = [
   CompileTimeErrorCode.MULTIPLE_REDIRECTING_CONSTRUCTOR_INVOCATIONS,
   CompileTimeErrorCode.MULTIPLE_SUPER_INITIALIZERS,
   CompileTimeErrorCode.NO_ANNOTATION_CONSTRUCTOR_ARGUMENTS,
+  CompileTimeErrorCode.NO_COMBINED_SUPER_SIGNATURE,
   CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_EXPLICIT,
   CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT,
   CompileTimeErrorCode.NON_CONST_MAP_AS_EXPRESSION_STATEMENT,

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -91,7 +91,7 @@ typedef WorkToWaitAfterComputingResult = Future<void> Function(String path);
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 101;
+  static const int DATA_VERSION = 102;
 
   /// The length of the list returned by [_computeDeclaredVariablesSignature].
   static const int _declaredVariablesSignatureLength = 4;

pkg/analyzer/lib/src/dart/element/element.dart

@@ -5878,6 +5878,18 @@ class MethodElementImpl extends ExecutableElementImpl implements MethodElement {
     return super.name;
   }
 
+  /// Return the error reported during type inference for this method, or
+  /// `null` if this method is not a subject of type inference, or there was
+  /// no error.
+  TopLevelInferenceError get typeInferenceError {
+    if (linkedNode != null) {
+      return linkedContext.getTypeInferenceError(linkedNode);
+    }
+
+    // We don't support type inference errors without linking.
+    return null;
+  }
+
   @override
   T accept<T>(ElementVisitor<T> visitor) => visitor.visitMethodElement(this);
 }
@@ -6421,7 +6433,9 @@ abstract class NonParameterVariableElementImpl extends VariableElementImpl {
     _type = type;
   }
 
-  @override
+  /// Return the error reported during type inference for this variable, or
+  /// `null` if this variable is not a subject of type inference, or there was
+  /// no error.
   TopLevelInferenceError get typeInferenceError {
     if (linkedNode != null) {
       return linkedContext.getTypeInferenceError(linkedNode);
@@ -6703,16 +6717,6 @@ class ParameterElementImpl extends VariableElementImpl
   @override
   DartType get type => ElementTypeProvider.current.getVariableType(this);
 
-  @override
-  TopLevelInferenceError get typeInferenceError {
-    if (linkedNode != null) {
-      return linkedContext.getTypeInferenceError(linkedNode);
-    }
-
-    // We don't support type inference errors without linking.
-    return null;
-  }
-
   @override
   DartType get typeInternal {
     if (linkedNode != null) {
@@ -7846,13 +7850,6 @@ abstract class VariableElementImpl extends ElementImpl
     _type = type;
   }
 
-  /// Return the error reported during type inference for this variable, or
-  /// `null` if this variable is not a subject of type inference, or there was
-  /// no error.
-  TopLevelInferenceError get typeInferenceError {
-    return null;
-  }
-
   /// Gets the element's type, without going through the indirection of
   /// [ElementTypeProvider].
   ///

pkg/analyzer/lib/src/error/codes.dart

@@ -4247,6 +4247,26 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
           correction: "Try adding an empty argument list.",
           hasPublishedDocs: true);
 
+  /**
+   * A method `m` of a class `C` is subject to override inference if it is
+   * missing one or more component types of its signature, and one or more of
+   * the direct superinterfaces of `C` has a member named `m` (*that is, `C.m`
+   * overrides one or more declarations*).  Each missing type is filled in with
+   * the corresponding type from the combined member signature `s` of `m` in
+   * the direct superinterfaces of `C`.
+   *
+   * A compile-time error occurs if `s` does not exist.
+   *
+   * Parameters:
+   * 0: the name of the class where override error was detected
+   * 1: the list of candidate signatures which cannot be combined
+   */
+  static const CompileTimeErrorCode NO_COMBINED_SUPER_SIGNATURE =
+      CompileTimeErrorCode('NO_COMBINED_SUPER_SIGNATURE',
+          "No valid combined signature in superinterfaces of '{0}': {1}.",
+          correction: "Try providing explicit types for this method's "
+              "parameters and return type.");
+
   /**
    * Parameters:
    * 0: the name of the superclass that does not define an implicitly invoked

pkg/analyzer/lib/src/error/inheritance_override.dart

@@ -18,6 +18,7 @@ import 'package:analyzer/src/error/correct_override.dart';
 import 'package:analyzer/src/error/getter_setter_types_verifier.dart';
 import 'package:analyzer/src/generated/resolver.dart' show TypeSystemImpl;
 import 'package:analyzer/src/generated/type_system.dart';
+import 'package:analyzer/src/summary/idl.dart';
 import 'package:meta/meta.dart';
 
 class InheritanceOverrideVerifier {
@@ -174,6 +175,11 @@ class _ClassVerifier {
           _checkDeclaredMember(field.name, libraryUri, fieldElement.setter);
         }
       } else if (member is MethodDeclaration) {
+        var hasError = _reportNoCombinedSuperSignature(member);
+        if (hasError) {
+          continue;
+        }
+
         _checkDeclaredMember(member.name, libraryUri, member.declaredElement,
             methodParameterNodes: member.parameters?.parameters);
       }
@@ -700,6 +706,26 @@ class _ClassVerifier {
     }
   }
 
+  bool _reportNoCombinedSuperSignature(MethodDeclaration node) {
+    var element = node.declaredElement;
+    if (element is MethodElementImpl) {
+      var inferenceError = element.typeInferenceError;
+      if (inferenceError?.kind ==
+          TopLevelInferenceErrorKind.overrideNoCombinedSuperSignature) {
+        reporter.reportErrorForNode(
+          CompileTimeErrorCode.NO_COMBINED_SUPER_SIGNATURE,
+          node.name,
+          [
+            classElement.name,
+            inferenceError.arguments[0],
+          ],
+        );
+        return true;
+      }
+    }
+    return false;
+  }
+
   static bool _constantValuesEqual(DartObject x, DartObject y) {
     // If either constant value couldn't be computed due to an error, the
     // corresponding DartObject will be `null`.  Since an error has already been

pkg/analyzer/lib/src/summary/format.dart

@@ -7272,13 +7272,15 @@ class LinkedNodeBuilder extends Object
 
   @override
   TopLevelInferenceErrorBuilder get topLevelTypeInferenceError {
-    assert(kind == idl.LinkedNodeKind.simpleFormalParameter ||
+    assert(kind == idl.LinkedNodeKind.methodDeclaration ||
+        kind == idl.LinkedNodeKind.simpleFormalParameter ||
         kind == idl.LinkedNodeKind.variableDeclaration);
     return _variantField_32;
   }
 
   set topLevelTypeInferenceError(TopLevelInferenceErrorBuilder value) {
-    assert(kind == idl.LinkedNodeKind.simpleFormalParameter ||
+    assert(kind == idl.LinkedNodeKind.methodDeclaration ||
+        kind == idl.LinkedNodeKind.simpleFormalParameter ||
         kind == idl.LinkedNodeKind.variableDeclaration);
     _variantField_32 = value;
   }
@@ -8063,6 +8065,7 @@ class LinkedNodeBuilder extends Object
     LinkedNodeBuilder methodDeclaration_typeParameters,
     int informativeId,
     bool methodDeclaration_hasOperatorEqualWithParameterTypeFromObject,
+    TopLevelInferenceErrorBuilder topLevelTypeInferenceError,
   })  : _kind = idl.LinkedNodeKind.methodDeclaration,
         _variantField_24 = actualReturnType,
         _variantField_4 = annotatedNode_metadata,
@@ -8072,7 +8075,8 @@ class LinkedNodeBuilder extends Object
         _variantField_9 = methodDeclaration_typeParameters,
         _variantField_36 = informativeId,
         _variantField_31 =
-            methodDeclaration_hasOperatorEqualWithParameterTypeFromObject;
+            methodDeclaration_hasOperatorEqualWithParameterTypeFromObject,
+        _variantField_32 = topLevelTypeInferenceError;
 
   LinkedNodeBuilder.methodInvocation({
     LinkedNodeTypeBuilder invocationExpression_invokeType,
@@ -8739,6 +8743,7 @@ class LinkedNodeBuilder extends Object
       methodDeclaration_returnType?.flushInformative();
       methodDeclaration_typeParameters?.flushInformative();
       informativeId = null;
+      topLevelTypeInferenceError?.flushInformative();
     } else if (kind == idl.LinkedNodeKind.methodInvocation) {
       invocationExpression_invokeType?.flushInformative();
       methodInvocation_methodName?.flushInformative();
@@ -9939,6 +9944,8 @@ class LinkedNodeBuilder extends Object
       signature.addBool(
           this.methodDeclaration_hasOperatorEqualWithParameterTypeFromObject ==
               true);
+      signature.addBool(this.topLevelTypeInferenceError != null);
+      this.topLevelTypeInferenceError?.collectApiSignature(signature);
       signature.addString(this.name ?? '');
     } else if (kind == idl.LinkedNodeKind.methodInvocation) {
       signature.addInt(this.kind == null ? 0 : this.kind.index);
@@ -12948,7 +12955,8 @@ class _LinkedNodeImpl extends Object
 
   @override
   idl.TopLevelInferenceError get topLevelTypeInferenceError {
-    assert(kind == idl.LinkedNodeKind.simpleFormalParameter ||
+    assert(kind == idl.LinkedNodeKind.methodDeclaration ||
+        kind == idl.LinkedNodeKind.simpleFormalParameter ||
         kind == idl.LinkedNodeKind.variableDeclaration);
     _variantField_32 ??= const _TopLevelInferenceErrorReader()
         .vTableGet(_bc, _bcOffset, 32, null);
@@ -14085,6 +14093,10 @@ abstract class _LinkedNodeMixin implements idl.LinkedNode {
         _result["methodDeclaration_hasOperatorEqualWithParameterTypeFromObject"] =
             methodDeclaration_hasOperatorEqualWithParameterTypeFromObject;
       }
+      if (topLevelTypeInferenceError != null) {
+        _result["topLevelTypeInferenceError"] =
+            topLevelTypeInferenceError.toJson();
+      }
     }
     if (kind == idl.LinkedNodeKind.methodInvocation) {
       if (invocationExpression_invokeType != null) {
@@ -15441,6 +15453,7 @@ abstract class _LinkedNodeMixin implements idl.LinkedNode {
         "methodDeclaration_hasOperatorEqualWithParameterTypeFromObject":
             methodDeclaration_hasOperatorEqualWithParameterTypeFromObject,
         "name": name,
+        "topLevelTypeInferenceError": topLevelTypeInferenceError,
       };
     }
     if (kind == idl.LinkedNodeKind.methodInvocation) {
@@ -17655,7 +17668,6 @@ class TopLevelInferenceErrorBuilder extends Object
     implements idl.TopLevelInferenceError {
   List<String> _arguments;
   idl.TopLevelInferenceErrorKind _kind;
-  int _slot;
 
   @override
   List<String> get arguments => _arguments ??= <String>[];
@@ -17674,29 +17686,16 @@ class TopLevelInferenceErrorBuilder extends Object
     this._kind = value;
   }
 
-  @override
-  int get slot => _slot ??= 0;
-
-  /// The slot id (which is unique within the compilation unit) identifying the
-  /// target of type inference with which this [TopLevelInferenceError] is
-  /// associated.
-  set slot(int value) {
-    assert(value == null || value >= 0);
-    this._slot = value;
-  }
-
   TopLevelInferenceErrorBuilder(
-      {List<String> arguments, idl.TopLevelInferenceErrorKind kind, int slot})
+      {List<String> arguments, idl.TopLevelInferenceErrorKind kind})
       : _arguments = arguments,
-        _kind = kind,
-        _slot = slot;
+        _kind = kind;
 
   /// Flush [informative] data recursively.
   void flushInformative() {}
 
   /// Accumulate non-[informative] data into [signature].
   void collectApiSignature(api_sig.ApiSignature signature) {
-    signature.addInt(this._slot ?? 0);
     signature.addInt(this._kind == null ? 0 : this._kind.index);
     if (this._arguments == null) {
       signature.addInt(0);
@@ -17716,13 +17715,10 @@ class TopLevelInferenceErrorBuilder extends Object
     }
     fbBuilder.startTable();
     if (offset_arguments != null) {
-      fbBuilder.addOffset(2, offset_arguments);
+      fbBuilder.addOffset(1, offset_arguments);
     }
     if (_kind != null && _kind != idl.TopLevelInferenceErrorKind.assignment) {
-      fbBuilder.addUint8(1, _kind.index);
-    }
-    if (_slot != null && _slot != 0) {
-      fbBuilder.addUint32(0, _slot);
+      fbBuilder.addUint8(0, _kind.index);
     }
     return fbBuilder.endTable();
   }
@@ -17747,27 +17743,20 @@ class _TopLevelInferenceErrorImpl extends Object
 
   List<String> _arguments;
   idl.TopLevelInferenceErrorKind _kind;
-  int _slot;
 
   @override
   List<String> get arguments {
     _arguments ??= const fb.ListReader<String>(fb.StringReader())
-        .vTableGet(_bc, _bcOffset, 2, const <String>[]);
+        .vTableGet(_bc, _bcOffset, 1, const <String>[]);
     return _arguments;
   }
 
   @override
   idl.TopLevelInferenceErrorKind get kind {
     _kind ??= const _TopLevelInferenceErrorKindReader().vTableGet(
-        _bc, _bcOffset, 1, idl.TopLevelInferenceErrorKind.assignment);
+        _bc, _bcOffset, 0, idl.TopLevelInferenceErrorKind.assignment);
     return _kind;
   }
-
-  @override
-  int get slot {
-    _slot ??= const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 0, 0);
-    return _slot;
-  }
 }
 
 abstract class _TopLevelInferenceErrorMixin
@@ -17781,17 +17770,13 @@ abstract class _TopLevelInferenceErrorMixin
     if (kind != idl.TopLevelInferenceErrorKind.assignment) {
       _result["kind"] = kind.toString().split('.')[1];
     }
-    if (slot != 0) {
-      _result["slot"] = slot;
-    }
     return _result;
   }
 
   @override
   Map<String, Object> toMap() => {
         "arguments": arguments,
         "kind": kind,
-        "slot": slot,
       };
 
   @override

pkg/analyzer/lib/src/summary/format.fbs

@@ -437,9 +437,7 @@ enum TopLevelInferenceErrorKind : byte {
 
   overrideConflictFieldType,
 
-  overrideConflictReturnType,
-
-  overrideConflictParameterType
+  overrideNoCombinedSuperSignature
 }
 
 /// Enum of token types, corresponding to AST token types.
@@ -1267,15 +1265,10 @@ table PackageBundleSdk {
 /// Summary information about a top-level type inference error.
 table TopLevelInferenceError {
   /// The [kind] specific arguments.
-  arguments:[string] (id: 2);
+  arguments:[string] (id: 1);
 
   /// The kind of the error.
-  kind:TopLevelInferenceErrorKind (id: 1);
-
-  /// The slot id (which is unique within the compilation unit) identifying the
-  /// target of type inference with which this [TopLevelInferenceError] is
-  /// associated.
-  slot:uint (id: 0);
+  kind:TopLevelInferenceErrorKind (id: 0);
 }
 
 table UnlinkedInformativeData {