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

pkg/analyzer/lib/src/generated/resolver.dart

Index: pkg/analyzer/lib/src/generated/resolver.dart
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index 241d53009526d08ffb3173aa8b6ea8e4443a04f1..aed62ae5c8ecd8086f67cb0d1ec3256dd044513e 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -6139,11 +6139,7 @@ class ResolverVisitor extends ScopedVisitor {
     // have to clone the initializers for non-static final fields (because if
     // they occur in a class with a const constructor, they will be needed to
     // evaluate the const constructor).
-    if ((element.isConst ||
-            (element is FieldElement &&
-                element.isFinal &&
-                !element.isStatic)) &&
-        node.initializer != null) {
+    if (element is ConstVariableElement) {
       (element as ConstVariableElement).constantInitializer =
           new ConstantAstCloner().cloneNode(node.initializer);
     }