Build / resynthesize final fields as ConstFieldElementImpl only if the enclosing class has a consta…

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 400 matching lines @@
    * The unlinked representation of the class in the summary.
    */
   final UnlinkedClass _unlinkedClass;
 
   /**
    * The kernel of the element.
    */
   final kernel.Class _kernel;
 
   /**
+   * If this class is resynthesized, whether it has a constant constructor.
+   */
+  bool _hasConstConstructorCached;
+
+  /**
    * The actual supertype extracted from desugared [_kernel].
    */
   kernel.Supertype _kernelSupertype;
 
   /**
    * The mixed-in types extracted from desugared [_kernel].
    */
   List<kernel.Supertype> _kernelMixins;
 
   /**
@@ skipping 580 matching lines @@
   ConstructorElement get unnamedConstructor {
     for (ConstructorElement element in constructors) {
       String name = element.displayName;
       if (name == null || name.isEmpty) {
         return element;
       }
     }
     return null;
   }
 
-  bool get _hasConstConstructorKernel =>
-      _kernel != null && _kernel.constructors.any((c) => c.isConst);
+  /**
+   * Return whether the class is resynthesized and has a constant constructor.
+   */
+  bool get _hasConstConstructor {
+    if (_hasConstConstructorCached == null) {
+      _hasConstConstructorCached = false;
+      if (_kernel != null) {
+        _hasConstConstructorCached = _kernel.constructors.any((c) => c.isConst);
+      }
+      if (_unlinkedClass != null) {
+        _hasConstConstructorCached = _unlinkedClass.executables.any(
+            (c) => c.kind == UnlinkedExecutableKind.constructor && c.isConst);
+      }
+    }
+    return _hasConstConstructorCached;
+  }
 
   @override
   void appendTo(StringBuffer buffer) {
     if (isAbstract) {
       buffer.write('abstract ');
     }
     buffer.write('class ');
     String name = displayName;
     if (name == null) {
       buffer.write("{unnamed class}");
@@ skipping 3512 matching lines @@
    */
   FieldElementImpl.forKernel(ElementImpl enclosingElement, kernel.Field kernel)
       : super.forKernel(enclosingElement, kernel);
 
   /**
    * Initialize using the given kernel.
    */
   factory FieldElementImpl.forKernelFactory(
       ClassElementImpl enclosingClass, kernel.Field kernel) {
     if (kernel.isConst ||
-        kernel.isFinal && enclosingClass._hasConstConstructorKernel) {
+        kernel.isFinal &&
+            !kernel.isStatic &&
+            enclosingClass._hasConstConstructor) {
       return new ConstFieldElementImpl.forKernel(enclosingClass, kernel);
     } else {
       return new FieldElementImpl.forKernel(enclosingClass, kernel);
     }
   }
 
   /**
    * Initialize a newly created field element to have the given [name].
    */
   FieldElementImpl.forNode(Identifier name) : super.forNode(name);
 
   /**
    * Initialize using the given serialized information.
    */
   FieldElementImpl.forSerialized(
       UnlinkedVariable unlinkedVariable, ElementImpl enclosingElement)
       : super.forSerialized(unlinkedVariable, enclosingElement);
 
   /**
    * Initialize using the given serialized information.
    */
   factory FieldElementImpl.forSerializedFactory(
       UnlinkedVariable unlinkedVariable, ClassElementImpl enclosingClass) {
     if (unlinkedVariable.initializer?.bodyExpr != null &&
         (unlinkedVariable.isConst ||
-            unlinkedVariable.isFinal && !unlinkedVariable.isStatic)) {
+            unlinkedVariable.isFinal &&
+                !unlinkedVariable.isStatic &&
+                enclosingClass._hasConstConstructor)) {
       return new ConstFieldElementImpl.forSerialized(
           unlinkedVariable, enclosingClass);
     } else {
       return new FieldElementImpl.forSerialized(
           unlinkedVariable, enclosingClass);
     }
   }
 
   @override
   ClassElement get enclosingElement => super.enclosingElement as ClassElement;
@@ skipping 5394 matching lines @@
 
   @override
   DartObject computeConstantValue() => null;
 
   @override
   void visitChildren(ElementVisitor visitor) {
     super.visitChildren(visitor);
     _initializer?.accept(visitor);
   }
 }