Revert "Fix #30858, generic function types not serializable when const."

This reverts commit 60ee2c0.

Reason for revert: Requires https://dart-review.googlesource.com/c/sdk/+/33180 which can land first.

Original change's description:
> Fix #30858, generic function types not serializable when const.
> 
> Previously declaring for instance const lists (or even final lists) of
> generic function types ie `final x = <void Function()>[]` would throw
> errors during summarization.
> 
> The type parameters don't seem correctly stored yet, but that is an
> edge case. Left a TODO, for now this should go in to prevent the
> analyzer crash.
> 
> One thing I changed as well is that `serializeType` assumed it was
> getting a type name, and `serializeTypeName` accepted types but threw
> when it didn't get a type name. I flipped the names so that
> `serializeTypeName` accepts a type name and `serializeType` accepts a
> type in general and decides whether its a type name or a generic
> function type to proceed with specialization.
> 
> Bug: 30858
> Change-Id: Id128f8625cbf03bb94d05ff0efdbac3b158e637e
> Reviewed-on: https://dart-review.googlesource.com/20481
> Reviewed-by: Paul Berry <[email protected]>
> Reviewed-by: Konstantin Shcheglov <[email protected]>

[email protected],[email protected],[email protected]

Change-Id: I6fae28335f7815b1e8c43597fb9451519a13335e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 30858
Reviewed-on: https://dart-review.googlesource.com/33200
Reviewed-by: Mike Fairhurst <[email protected]>
Commit-Queue: Mike Fairhurst <[email protected]>

Author: MichaelRFairhurst

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

@@ -418,17 +418,14 @@ class FunctionTypeImpl extends TypeImpl implements FunctionType {
    * Initialize a newly created function type that is semantically the same as
    * [original], but which has been syntactically renamed with fresh type
    * parameters at its outer binding site (if any).
-   *
-   * If type formals is empty, this returns the original unless [force] is set
-   * to [true].
    */
-  factory FunctionTypeImpl.fresh(FunctionType original, {bool force = false}) {
+  factory FunctionTypeImpl.fresh(FunctionType original) {
     // We build up a substitution for the type parameters,
     // {variablesFresh/variables} then apply it.
 
     var originalFormals = original.typeFormals;
     var formalCount = originalFormals.length;
-    if (formalCount == 0 && !force) return original;
+    if (formalCount == 0) return original;
 
     // Allocate fresh type variables
     var typeVars = <DartType>[];

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

@@ -2307,12 +2307,6 @@ class EntityRefBuilder extends Object
       _implicitFunctionTypeIndices ??= <int>[];
 
   /**
-   * Notice: This will be deprecated. However, its not deprecated yet, as we're
-   * keeping it for backwards compatibilty, and marking it deprecated makes it
-   * unreadable.
-   *
-   * TODO(mfairhurst) mark this deprecated, and remove its logic.
-   *
    * If this is a reference to a function type implicitly defined by a
    * function-typed parameter, a list of zero-based indices indicating the path
    * from the entity referred to by [reference] to the appropriate type

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

@@ -1215,12 +1215,6 @@ table EntityRef {
   entityKind:EntityRefKind (id: 8);
 
   /**
-   * Notice: This will be deprecated. However, its not deprecated yet, as we're
-   * keeping it for backwards compatibilty, and marking it deprecated makes it
-   * unreadable.
-   *
-   * TODO(mfairhurst) mark this deprecated, and remove its logic.
-   *
    * If this is a reference to a function type implicitly defined by a
    * function-typed parameter, a list of zero-based indices indicating the path
    * from the entity referred to by [reference] to the appropriate type

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

@@ -405,12 +405,6 @@ abstract class EntityRef extends base.SummaryClass {
   EntityRefKind get entityKind;
 
   /**
-   * Notice: This will be deprecated. However, its not deprecated yet, as we're
-   * keeping it for backwards compatibilty, and marking it deprecated makes it
-   * unreadable.
-   *
-   * TODO(mfairhurst) mark this deprecated, and remove its logic.
-   *
    * If this is a reference to a function type implicitly defined by a
    * function-typed parameter, a list of zero-based indices indicating the path
    * from the entity referred to by [reference] to the appropriate type

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

@@ -229,18 +229,14 @@ EntityRefBuilder _createLinkedType(
       // TODO(paulberry): do I need to store type arguments?
       return result;
     }
-    if (element is GenericFunctionTypeElementForLink) {
-      // Function types are their own type parameter context
-      typeParameterContext = element;
+    if (element is GenericFunctionTypeElement) {
       result.entityKind = EntityRefKind.genericFunctionType;
       result.syntheticReturnType = _createLinkedType(
           type.returnType, compilationUnit, typeParameterContext);
       result.syntheticParams = type.parameters
           .map((ParameterElement param) => _serializeSyntheticParam(
               param, compilationUnit, typeParameterContext))
           .toList();
-      _storeTypeArguments(
-          type.typeArguments, result, compilationUnit, typeParameterContext);
       return result;
     }
     // TODO(paulberry): implement other cases.

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

@@ -74,8 +74,7 @@ class _ConstExprSerializer extends AbstractConstExprSerializer {
   @override
   EntityRefBuilder serializeConstructorRef(DartType type, Identifier typeName,
       TypeArgumentList typeArguments, SimpleIdentifier name) {
-    EntityRefBuilder typeBuilder =
-        serializeTypeName(type, typeName, typeArguments);
+    EntityRefBuilder typeBuilder = serializeType(type, typeName, typeArguments);
     if (name == null) {
       return typeBuilder;
     } else {
@@ -144,14 +143,10 @@ class _ConstExprSerializer extends AbstractConstExprSerializer {
   }
 
   @override
-  EntityRefBuilder serializeTypeName(
+  EntityRefBuilder serializeType(
       DartType type, Identifier name, TypeArgumentList arguments) {
-    return visitor.serializeTypeName(name, arguments);
+    return visitor.serializeType(name, arguments);
   }
-
-  @override
-  EntityRefBuilder serializeGenericFunctionType(GenericFunctionType node) =>
-      visitor.serializeGenericFunctionType(node);
 }
 
 /**
@@ -454,15 +449,16 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
     b.typeParameters =
         serializeTypeParameters(typeParameters, typeParameterScope);
     if (superclass != null) {
-      b.supertype = serializeType(superclass);
+      b.supertype = serializeTypeName(superclass);
     } else {
       b.hasNoSupertype = isCoreLibrary && name == 'Object';
     }
     if (withClause != null) {
-      b.mixins = withClause.mixinTypes.map(serializeType).toList();
+      b.mixins = withClause.mixinTypes.map(serializeTypeName).toList();
     }
     if (implementsClause != null) {
-      b.interfaces = implementsClause.interfaces.map(serializeType).toList();
+      b.interfaces =
+          implementsClause.interfaces.map(serializeTypeName).toList();
     }
     if (members != null) {
       scopes.add(buildClassMemberScope(name, members));
@@ -628,7 +624,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
     if (!isTopLevel) {
       b.isStatic = isDeclaredStatic;
     }
-    b.returnType = serializeType(returnType);
+    b.returnType = serializeTypeName(returnType);
     bool isSemanticallyStatic = isTopLevel || isDeclaredStatic;
     if (formalParameters != null) {
       bool oldMayInheritCovariance = _parametersMayInheritCovariance;
@@ -739,7 +735,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
    */
   void serializeFunctionTypedParameterDetails(UnlinkedParamBuilder b,
       TypeAnnotation returnType, FormalParameterList parameters) {
-    EntityRefBuilder serializedReturnType = serializeType(returnType);
+    EntityRefBuilder serializedReturnType = serializeTypeName(returnType);
     if (serializedReturnType != null) {
       b.type = serializedReturnType;
     }
@@ -763,7 +759,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
         serializeTypeParameters(node.typeParameters, typeParameterScope);
     b.syntheticReturnType = node.returnType == null
         ? serializeDynamic()
-        : serializeType(node.returnType);
+        : serializeTypeName(node.returnType);
     b.syntheticParams = node.parameters.parameters
         .map((FormalParameter p) => p.accept(this) as UnlinkedParamBuilder)
         .toList();
@@ -870,7 +866,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
    * a [EntityRef].  Note that this method does the right thing if the
    * name doesn't refer to an entity other than a type (e.g. a class member).
    */
-  EntityRefBuilder serializeTypeName(
+  EntityRefBuilder serializeType(
       Identifier identifier, TypeArgumentList typeArguments) {
     if (identifier == null) {
       return null;
@@ -915,7 +911,8 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
             'Unexpected identifier type: ${identifier.runtimeType}');
       }
       if (typeArguments != null) {
-        b.typeArguments = typeArguments.arguments.map(serializeType).toList();
+        b.typeArguments =
+            typeArguments.arguments.map(serializeTypeName).toList();
       }
       return b;
     }
@@ -927,9 +924,9 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
    * a [EntityRef].  Note that this method does the right thing if the
    * name doesn't refer to an entity other than a type (e.g. a class member).
    */
-  EntityRefBuilder serializeType(TypeAnnotation node) {
+  EntityRefBuilder serializeTypeName(TypeAnnotation node) {
     if (node is TypeName) {
-      return serializeTypeName(node?.name, node?.typeArguments);
+      return serializeType(node?.name, node?.typeArguments);
     } else if (node is GenericFunctionType) {
       return serializeGenericFunctionType(node);
     } else if (node != null) {
@@ -977,7 +974,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
       b.isStatic = isDeclaredStatic;
       b.name = variable.name.name;
       b.nameOffset = variable.name.offset;
-      b.type = serializeType(variables.type);
+      b.type = serializeTypeName(variables.type);
       b.documentationComment = serializeDocumentation(documentationComment);
       b.annotations = serializeAnnotations(annotations);
       b.codeRange = serializeCodeRange(variables.parent);
@@ -1161,7 +1158,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
       if (node.parameters != null) {
         serializeFunctionTypedParameterDetails(b, node.type, node.parameters);
       } else {
-        b.type = serializeType(node.type);
+        b.type = serializeTypeName(node.type);
       }
     }
     return b;
@@ -1225,7 +1222,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
     b.nameOffset = node.name.offset;
     b.typeParameters =
         serializeTypeParameters(node.typeParameters, typeParameterScope);
-    EntityRefBuilder serializedReturnType = serializeType(node.returnType);
+    EntityRefBuilder serializedReturnType = serializeTypeName(node.returnType);
     if (serializedReturnType != null) {
       b.returnType = serializedReturnType;
     }
@@ -1348,7 +1345,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
   @override
   UnlinkedParamBuilder visitSimpleFormalParameter(SimpleFormalParameter node) {
     UnlinkedParamBuilder b = serializeParameter(node);
-    b.type = serializeType(node.type);
+    b.type = serializeTypeName(node.type);
     return b;
   }
 
@@ -1364,7 +1361,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
     b.name = node.name.name;
     b.nameOffset = node.name.offset;
     if (node.bound != null) {
-      b.bound = serializeType(node.bound);
+      b.bound = serializeTypeName(node.bound);
     }
     b.annotations = serializeAnnotations(node.metadata);
     b.codeRange = serializeCodeRange(node);

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

@@ -198,25 +198,15 @@ abstract class AbstractConstExprSerializer {
    * given [name] and [arguments].  The parameter [type] might be `null` if the
    * type is not resolved.
    */
-  EntityRefBuilder serializeTypeName(
+  EntityRefBuilder serializeType(
       DartType type, Identifier name, TypeArgumentList arguments);
 
-  /**
-   * Return [EntityRefBuilder] that corresponds to the [type], which is defined
-   * using generic function type syntax. These may appear as the type arguments
-   * of a const list, etc.
-   */
-  EntityRefBuilder serializeGenericFunctionType(GenericFunctionType type);
-
   /**
    * Return [EntityRefBuilder] that corresponds to the given [type].
    */
-  EntityRefBuilder serializeType(TypeAnnotation type) {
+  EntityRefBuilder serializeTypeName(TypeAnnotation type) {
     if (type is TypeName) {
-      return serializeTypeName(type?.type, type?.name, type?.typeArguments);
-    }
-    if (type is GenericFunctionType) {
-      return serializeGenericFunctionType(type);
+      return serializeType(type?.type, type?.name, type?.typeArguments);
     }
     throw new ArgumentError(
         'Cannot serialize an instance of ${type.runtimeType}');
@@ -417,12 +407,12 @@ abstract class AbstractConstExprSerializer {
     } else if (expr is AsExpression) {
       isValidConst = false;
       _serialize(expr.expression);
-      references.add(serializeType(expr.type));
+      references.add(serializeTypeName(expr.type));
       operations.add(UnlinkedExprOperation.typeCast);
     } else if (expr is IsExpression) {
       isValidConst = false;
       _serialize(expr.expression);
-      references.add(serializeType(expr.type));
+      references.add(serializeTypeName(expr.type));
       operations.add(UnlinkedExprOperation.typeCheck);
     } else if (expr is SuperExpression) {
       operations.add(UnlinkedExprOperation.pushSuper);
@@ -564,7 +554,7 @@ abstract class AbstractConstExprSerializer {
     }
     if (expr.typeArguments != null &&
         expr.typeArguments.arguments.length == 1) {
-      references.add(serializeType(expr.typeArguments.arguments[0]));
+      references.add(serializeTypeName(expr.typeArguments.arguments[0]));
       operations.add(UnlinkedExprOperation.makeTypedList);
     } else {
       operations.add(UnlinkedExprOperation.makeUntypedList);
@@ -583,8 +573,8 @@ abstract class AbstractConstExprSerializer {
     }
     if (expr.typeArguments != null &&
         expr.typeArguments.arguments.length == 2) {
-      references.add(serializeType(expr.typeArguments.arguments[0]));
-      references.add(serializeType(expr.typeArguments.arguments[1]));
+      references.add(serializeTypeName(expr.typeArguments.arguments[0]));
+      references.add(serializeTypeName(expr.typeArguments.arguments[1]));
       operations.add(UnlinkedExprOperation.makeTypedMap);
     } else {
       operations.add(UnlinkedExprOperation.makeUntypedMap);
@@ -708,7 +698,7 @@ abstract class AbstractConstExprSerializer {
     } else {
       ints.add(typeArguments.arguments.length);
       for (TypeAnnotation type in typeArguments.arguments) {
-        references.add(serializeType(type));
+        references.add(serializeTypeName(type));
       }
     }
   }

pkg/analyzer/lib/src/task/strong_mode.dart

@@ -169,16 +169,7 @@ class InstanceMemberInferrer {
           parameter, index, overriddenTypes[i].parameters);
       DartType type = matchingParameter?.type ?? typeProvider.dynamicType;
       if (parameterType == null) {
-        if (type is FunctionType) {
-          // The resulting parameter's type element has an `enclosingElement` of
-          // the overridden parameter. Change it to the overriding parameter.
-          parameterType = new FunctionTypeImpl.fresh(type, force: true);
-          (parameterType.element as ElementImpl).enclosingElement = parameter;
-          // TODO(mfairhurst) handle cases where non-functions contain functions
-          // See test_inferredType_parameter_genericFunctionType_asTypeArgument
-        } else {
-          parameterType = type;
-        }
+        parameterType = type;
       } else if (parameterType != type) {
         if (parameter is ParameterElementForLink) {
           parameter.setInferenceError(new TopLevelInferenceErrorBuilder(

pkg/analyzer/test/src/summary/linker_test.dart

@@ -467,33 +467,6 @@ class C extends A<int> {
     expect(fType.parameters[0].type.toString(), 'int');
   }
 
-  @failingTest
-  void test_inferredType_parameter_genericFunctionType_asTypeArgument() {
-    var bundle = createPackageBundle('''
-class A<T> {
-  A<R> map<R>(List<R Function(T)> fs) => null;
-}
-''', path: '/a.dart');
-    addBundle('/a.ds', bundle);
-    createLinker('''
-import 'a.dart';
-class C extends A<int> {
-  map<R2>(fs) => null;
-}
-''');
-    LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
-    library.libraryCycleForLink.ensureLinked();
-    ClassElementForLink_Class c = library.getContainedName('C');
-    expect(c.methods, hasLength(1));
-    MethodElementForLink map = c.methods[0];
-    expect(map.parameters, hasLength(1));
-    InterfaceType iType = map.parameters[0].type;
-    expect(iType.typeArguments, hasLength(1));
-    FunctionType fType = iType.typeArguments[0];
-    expect(fType.returnType.toString(), 'R2');
-    expect(fType.parameters[0].type.toString(), 'int');
-  }
-
   void test_inferredType_staticField_dynamic() {
     createLinker('''
 dynamic x = null;