Various redemptions

pkg/compiler/lib/src/kernel/env.dart

 // Copyright (c) 2017, 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 dart2js.kernel.env;
 
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/clone.dart';
 import 'package:kernel/type_algebra.dart';
 
@@ skipping 545 matching lines @@
     return _constantConstructor;
   }
 
   @override
   ConstructorData copy() {
     return new ConstructorDataImpl(node, functionNode, definition);
   }
 }
 
 abstract class FieldData extends MemberData {
+  DartType getFieldType(KernelToElementMap elementMap);
+
   ConstantExpression getFieldConstant(
       KernelToElementMapBase elementMap, FieldEntity field);
 }
 
 class FieldDataImpl extends MemberDataImpl implements FieldData {
+  DartType _type;
   ConstantExpression _constant;
 
   FieldDataImpl(ir.Field node, MemberDefinition definition)
       : super(node, definition);
 
   ir.Field get node => super.node;
 
+  DartType getFieldType(covariant KernelToElementMapBase elementMap) {
+    return _type ??= elementMap.getDartType(node.type);
+  }
+
   ConstantExpression getFieldConstant(
       KernelToElementMapBase elementMap, FieldEntity field) {
     if (_constant == null) {
       if (node.isConst) {
         _constant = new Constantifier(elementMap).visit(node.initializer);
       } else {
         failedAt(
             field,
             "Unexpected field $field in "
             "FieldDataImpl.getFieldConstant");
       }
     }
     return _constant;
   }
 
   @override
   FieldData copy() {
     return new FieldDataImpl(node, definition);
   }
 }
 
 class TypedefData {
   final ir.Typedef node;
   final TypedefEntity element;
   final TypedefType rawType;
 
   TypedefData(this.node, this.element, this.rawType);
 }