Handle more constants in Constantifier

pkg/compiler/lib/src/kernel/element_map.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.element_map;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../common/names.dart' show Identifiers;
 import '../common/resolution.dart';
 import '../compile_time_constants.dart';
 import '../constants/constant_system.dart';
 import '../constants/constructors.dart';
 import '../constants/evaluation.dart';
 import '../constants/expressions.dart';
 import '../constants/values.dart';
 import '../common_elements.dart';
 import '../elements/elements.dart';
 import '../elements/entities.dart';
 import '../elements/types.dart';
+import '../environment.dart';
 import '../frontend_strategy.dart';
 import '../js_backend/constant_system_javascript.dart';
 import '../js_backend/native_data.dart';
 import '../js_backend/no_such_method_registry.dart';
 import '../native/native.dart' as native;
 import '../native/resolver.dart';
 import '../ordered_typeset.dart';
 import '../ssa/kernel_impact.dart';
 import '../universe/call_structure.dart';
 import '../universe/world_builder.dart';
 import '../util/util.dart' show Link, LinkBuilder;
 import 'element_adapter.dart';
 import 'elements.dart';
 
 part 'native_basic_data.dart';
 part 'no_such_method_resolver.dart';
 part 'types.dart';
 
 /// Element builder used for creating elements and types corresponding to Kernel
 /// IR nodes.
 class KernelToElementMap extends KernelElementAdapterMixin {
+  final Environment _environment;
   CommonElements _commonElements;
   native.BehaviorBuilder _nativeBehaviorBuilder;
   final DiagnosticReporter reporter;
   ElementEnvironment _elementEnvironment;
   DartTypeConverter _typeConverter;
   KernelConstantEnvironment _constantEnvironment;
   _KernelDartTypes _types;
 
   /// Library environment. Used for fast lookup.
   _KEnv _env = new _KEnv();
@@ skipping 13 matching lines @@
 
   List<_MemberData> _memberList = <_MemberData>[];
 
   Map<ir.Member, KConstructor> _constructorMap = <ir.Member, KConstructor>{};
   Map<ir.Procedure, KFunction> _methodMap = <ir.Procedure, KFunction>{};
   Map<ir.Field, KField> _fieldMap = <ir.Field, KField>{};
 
   Map<ir.TreeNode, KLocalFunction> _localFunctionMap =
       <ir.TreeNode, KLocalFunction>{};
 
-  KernelToElementMap(this.reporter) {
+  KernelToElementMap(this.reporter, this._environment) {
     _elementEnvironment = new KernelElementEnvironment(this);
     _commonElements = new CommonElements(_elementEnvironment);
     _constantEnvironment = new KernelConstantEnvironment(this);
     _nativeBehaviorBuilder = new KernelBehaviorBuilder(_commonElements);
     _types = new _KernelDartTypes(this);
     _typeConverter = new DartTypeConverter(this);
   }
 
   /// Adds libraries in [program] to the set of libraries.
   ///
@@ skipping 1092 matching lines @@
   }
 
   @override
   bool hasConstantValue(ConstantExpression expression) {
     throw new UnimplementedError("KernelConstantEnvironment.hasConstantValue");
   }
 }
 
 /// Evaluation environment used for computing [ConstantValue]s for
 /// kernel based [ConstantExpression]s.
-class _EvaluationEnvironment implements Environment {
-  final KernelToElementMap _worldBuilder;
+class _EvaluationEnvironment implements EvaluationEnvironment {
+  final KernelToElementMap _elementMap;
 
-  _EvaluationEnvironment(this._worldBuilder);
+  _EvaluationEnvironment(this._elementMap);
 
   @override
-  CommonElements get commonElements {
-    throw new UnimplementedError("_EvaluationEnvironment.commonElements");
-  }
+  CommonElements get commonElements => _elementMap.commonElements;
 
   @override
   InterfaceType substByContext(InterfaceType base, InterfaceType target) {
-    if (base.typeArguments.isNotEmpty) {
-      throw new UnimplementedError("_EvaluationEnvironment.substByContext");
-    }
-    return base;
+    return _elementMap._substByContext(base, target);
   }
 
   @override
   ConstantConstructor getConstructorConstant(ConstructorEntity constructor) {
-    return _worldBuilder._getConstructorConstant(constructor);
+    return _elementMap._getConstructorConstant(constructor);
   }
 
   @override
   ConstantExpression getFieldConstant(FieldEntity field) {
-    return _worldBuilder._getFieldConstant(field);
+    return _elementMap._getFieldConstant(field);
   }
 
   @override
   ConstantExpression getLocalConstant(Local local) {
     throw new UnimplementedError("_EvaluationEnvironment.getLocalConstant");
   }
 
   @override
   String readFromEnvironment(String name) {
-    throw new UnimplementedError("_EvaluationEnvironment.readFromEnvironment");
+    return _elementMap._environment.valueOf(name);
   }
 }
 
 class KernelResolutionWorldBuilder extends KernelResolutionWorldBuilderBase {
   final KernelToElementMap elementMap;
 
   KernelResolutionWorldBuilder(this.elementMap, NativeBasicData nativeBasicData,
       SelectorConstraintsStrategy selectorConstraintsStrategy)
       : super(elementMap.elementEnvironment, elementMap.commonElements,
             nativeBasicData, selectorConstraintsStrategy);
@@ skipping 51 matching lines @@
   }
 
   InterfaceType getMixinTypeForClass(KClass cls) {
     _KClassEnv env = builder._classEnvs[cls.classIndex];
     ir.Supertype mixedInType = env.cls.mixedInType;
     if (mixedInType == null) return null;
     return builder.createInterfaceType(
         mixedInType.classNode, mixedInType.typeArguments);
   }
 }