Revert two Kernel changes that were causing test failures.

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

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.src.dart.element.element;
 
 import 'dart:collection';
 import 'dart:math' show min;
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 1665 matching lines @@
    */
   void set functions(List<FunctionElement> functions) {
     for (FunctionElement function in functions) {
       (function as FunctionElementImpl).enclosingElement = this;
     }
     this._functions = functions;
   }
 
   @override
   List<FunctionTypeAliasElement> get functionTypeAliases {
-    if (_kernelContext != null) {
-      _typeAliases ??= _kernelContext.library.typedefs
-          .map((k) => new FunctionTypeAliasElementImpl.forKernel(this, k))
-          .toList(growable: false);
-    }
     if (_unlinkedUnit != null) {
       _typeAliases ??= _unlinkedUnit.typedefs.map((t) {
         if (t.style == TypedefStyle.functionType) {
           return new FunctionTypeAliasElementImpl.forSerialized(t, this);
         } else if (t.style == TypedefStyle.genericFunctionType) {
           return new GenericTypeAliasElementImpl.forSerialized(t, this);
         }
       }).toList(growable: false);
     }
     return _typeAliases ?? const <FunctionTypeAliasElement>[];
@@ skipping 2266 matching lines @@
       return _kernel.name.name;
     }
     if (serializedExecutable != null) {
       return serializedExecutable.name;
     }
     return super.displayName;
   }
 
   @override
   String get documentationComment {
-    if (_kernel != null) {
-      return _kernel.documentationComment;
-    }
     if (serializedExecutable != null) {
       return serializedExecutable?.documentationComment?.text;
     }
     return super.documentationComment;
   }
 
   /**
    * Set whether this executable element is external.
    */
   void set external(bool isExternal) {
@@ skipping 932 matching lines @@
  */
 class FunctionTypeAliasElementImpl extends ElementImpl
     with TypeParameterizedElementMixin
     implements FunctionTypeAliasElement {
   /**
    * The unlinked representation of the type in the summary.
    */
   final UnlinkedTypedef _unlinkedTypedef;
 
   /**
-   * The kernel of the element.
-   */
-  final kernel.Typedef _kernel;
-
-  /**
    * A list containing all of the parameters defined by this type alias.
    */
   List<ParameterElement> _parameters;
 
   /**
    * The return type defined by this type alias.
    */
   DartType _returnType;
 
   /**
    * The type of function defined by this type alias.
    */
   FunctionType _type;
 
   /**
    * Initialize a newly created type alias element to have the given name.
    *
    * [name] the name of this element
    * [nameOffset] the offset of the name of this element in the file that
    *    contains the declaration of this element
    */
   FunctionTypeAliasElementImpl(String name, int nameOffset)
       : _unlinkedTypedef = null,
-        _kernel = null,
         super(name, nameOffset);
 
   /**
-   * Initialize using the given kernel.
-   */
-  FunctionTypeAliasElementImpl.forKernel(
-      CompilationUnitElementImpl enclosingUnit, this._kernel)
-      : _unlinkedTypedef = null,
-        super.forSerialized(enclosingUnit);
-
-  /**
    * Initialize a newly created type alias element to have the given [name].
    */
   FunctionTypeAliasElementImpl.forNode(Identifier name)
       : _unlinkedTypedef = null,
-        _kernel = null,
         super.forNode(name);
 
   /**
    * Initialize using the given serialized information.
    */
   FunctionTypeAliasElementImpl.forSerialized(
       this._unlinkedTypedef, CompilationUnitElementImpl enclosingUnit)
-      : _kernel = null,
-        super.forSerialized(enclosingUnit);
+      : super.forSerialized(enclosingUnit);
 
   @override
   int get codeLength {
     if (_unlinkedTypedef != null) {
       return _unlinkedTypedef.codeRange?.length;
     }
     return super.codeLength;
   }
 
   @override
@@ skipping 20 matching lines @@
       super.enclosingElement as CompilationUnitElement;
 
   @override
   TypeParameterizedElementMixin get enclosingTypeParameterContext => null;
 
   @override
   CompilationUnitElementImpl get enclosingUnit =>
       _enclosingElement as CompilationUnitElementImpl;
 
   @override
-  List<kernel.TypeParameter> get kernelTypeParams => _kernel?.typeParameters;
+  List<kernel.TypeParameter> get kernelTypeParams => null;
 
   @override
   ElementKind get kind => ElementKind.FUNCTION_TYPE_ALIAS;
 
   @override
   List<ElementAnnotation> get metadata {
     if (_unlinkedTypedef != null) {
       return _metadata ??=
           _buildAnnotations(enclosingUnit, _unlinkedTypedef.annotations);
     }
     return super.metadata;
   }
 
   @override
   String get name {
-    if (_kernel != null) {
-      return _kernel.name;
-    }
     if (_unlinkedTypedef != null) {
       return _unlinkedTypedef.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
     int offset = super.nameOffset;
     if (offset == 0 && _unlinkedTypedef != null) {
       return _unlinkedTypedef.nameOffset;
     }
     return offset;
   }
 
   @override
   List<ParameterElement> get parameters {
-    if (_kernel != null) {
-      _parameters ??= ParameterElementImpl.forKernelParameters(
-          this,
-          _kernel.requiredParameterCount,
-          _kernel.positionalParameters,
-          _kernel.namedParameters);
-    }
     if (_unlinkedTypedef != null) {
       _parameters ??= ParameterElementImpl.resynthesizeList(
           _unlinkedTypedef.parameters, this);
     }
     return _parameters ?? const <ParameterElement>[];
   }
 
   /**
    * Set the parameters defined by this type alias to the given [parameters].
    */
   void set parameters(List<ParameterElement> parameters) {
     _assertNotResynthesized(_unlinkedTypedef);
     if (parameters != null) {
       for (ParameterElement parameter in parameters) {
         (parameter as ParameterElementImpl).enclosingElement = this;
       }
     }
     this._parameters = parameters;
   }
 
   @override
   DartType get returnType {
-    if (_returnType == null) {
-      if (_kernel != null) {
-        var type = _kernel.type as kernel.FunctionType;
-        _returnType =
-            enclosingUnit._kernelContext.getType(this, type.returnType);
-      }
-      if (_unlinkedTypedef != null) {
-        _returnType = enclosingUnit.resynthesizerContext.resolveTypeRef(
-            this, _unlinkedTypedef.returnType,
-            declaredType: true);
-      }
+    if (_unlinkedTypedef != null && _returnType == null) {
+      _returnType = enclosingUnit.resynthesizerContext.resolveTypeRef(
+          this, _unlinkedTypedef.returnType,
+          declaredType: true);
     }
     return _returnType;
   }
 
   void set returnType(DartType returnType) {
     _assertNotResynthesized(_unlinkedTypedef);
     _returnType = _checkElementOfType(returnType);
   }
 
   @override
   FunctionType get type {
-    if (_type == null) {
-      if (_kernel != null || _unlinkedTypedef != null) {
-        _type = new FunctionTypeImpl.forTypedef(this);
-      }
+    if (_unlinkedTypedef != null && _type == null) {
+      _type = new FunctionTypeImpl.forTypedef(this);
     }
     return _type;
   }
 
   void set type(FunctionType type) {
     _assertNotResynthesized(_unlinkedTypedef);
     _type = type;
   }
 
   /**
@@ skipping 2479 matching lines @@
   @override
   int get codeOffset {
     if (_unlinkedVariable != null) {
       return _unlinkedVariable.codeRange?.offset;
     }
     return super.codeOffset;
   }
 
   @override
   String get documentationComment {
-    if (_kernel != null) {
-      return _kernel.documentationComment;
-    }
     if (_unlinkedVariable != null) {
       return _unlinkedVariable?.documentationComment?.text;
     }
     return super.documentationComment;
   }
 
   @override
   bool get hasImplicitType {
     if (_unlinkedVariable != null) {
       return _unlinkedVariable.type == null;
@@ skipping 2118 matching lines @@
 
   @override
   DartObject computeConstantValue() => null;
 
   @override
   void visitChildren(ElementVisitor visitor) {
     super.visitChildren(visitor);
     _initializer?.accept(visitor);
   }
 }