| Index: pkg/compiler/lib/src/kernel/element_map_impl.dart
|
| diff --git a/pkg/compiler/lib/src/kernel/element_map.dart b/pkg/compiler/lib/src/kernel/element_map_impl.dart
|
| similarity index 98%
|
| copy from pkg/compiler/lib/src/kernel/element_map.dart
|
| copy to pkg/compiler/lib/src/kernel/element_map_impl.dart
|
| index e2ae7c741fde6414d3f1967f441bb4f4988b7836..04799da8136dadc191ce4ea6da5c6401a4c8033f 100644
|
| --- a/pkg/compiler/lib/src/kernel/element_map.dart
|
| +++ b/pkg/compiler/lib/src/kernel/element_map_impl.dart
|
| @@ -31,7 +31,7 @@ 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 'element_map.dart';
|
| import 'elements.dart';
|
|
|
| part 'native_basic_data.dart';
|
| @@ -40,7 +40,7 @@ part 'types.dart';
|
|
|
| /// Element builder used for creating elements and types corresponding to Kernel
|
| /// IR nodes.
|
| -class KernelToElementMap extends KernelElementAdapterMixin {
|
| +class KernelToElementMapImpl extends KernelToElementMapMixin {
|
| final Environment _environment;
|
| CommonElements _commonElements;
|
| native.BehaviorBuilder _nativeBehaviorBuilder;
|
| @@ -75,7 +75,7 @@ class KernelToElementMap extends KernelElementAdapterMixin {
|
| Map<ir.TreeNode, KLocalFunction> _localFunctionMap =
|
| <ir.TreeNode, KLocalFunction>{};
|
|
|
| - KernelToElementMap(this.reporter, this._environment) {
|
| + KernelToElementMapImpl(this.reporter, this._environment) {
|
| _elementEnvironment = new KernelElementEnvironment(this);
|
| _commonElements = new CommonElements(_elementEnvironment);
|
| _constantEnvironment = new KernelConstantEnvironment(this);
|
| @@ -818,7 +818,7 @@ class _KClassEnv {
|
| }
|
| }
|
|
|
| - Iterable<ConstantValue> getMetadata(KernelToElementMap elementMap) {
|
| + Iterable<ConstantValue> getMetadata(KernelToElementMapImpl elementMap) {
|
| return _metadata ??= elementMap.getMetadata(cls.annotations);
|
| }
|
| }
|
| @@ -829,11 +829,11 @@ class _MemberData {
|
|
|
| _MemberData(this.node);
|
|
|
| - ResolutionImpact getWorldImpact(KernelToElementMap elementMap) {
|
| + ResolutionImpact getWorldImpact(KernelToElementMapImpl elementMap) {
|
| return buildKernelImpact(node, elementMap);
|
| }
|
|
|
| - Iterable<ConstantValue> getMetadata(KernelToElementMap elementMap) {
|
| + Iterable<ConstantValue> getMetadata(KernelToElementMapImpl elementMap) {
|
| return _metadata ??= elementMap.getMetadata(node.annotations);
|
| }
|
| }
|
| @@ -845,7 +845,7 @@ class _FunctionData extends _MemberData {
|
|
|
| _FunctionData(ir.Member node, this.functionNode) : super(node);
|
|
|
| - FunctionType getFunctionType(KernelToElementMap elementMap) {
|
| + FunctionType getFunctionType(KernelToElementMapImpl elementMap) {
|
| return _type ??= elementMap.getFunctionType(functionNode);
|
| }
|
|
|
| @@ -864,7 +864,7 @@ class _ConstructorData extends _FunctionData {
|
| : super(node, functionNode);
|
|
|
| ConstantConstructor getConstructorConstant(
|
| - KernelToElementMap elementMap, KConstructor constructor) {
|
| + KernelToElementMapImpl elementMap, KConstructor constructor) {
|
| if (_constantConstructor == null) {
|
| if (node is ir.Constructor && constructor.isConst) {
|
| _constantConstructor =
|
| @@ -888,7 +888,7 @@ class _FieldData extends _MemberData {
|
| ir.Field get node => super.node;
|
|
|
| ConstantExpression getFieldConstant(
|
| - KernelToElementMap elementMap, KField field) {
|
| + KernelToElementMapImpl elementMap, KField field) {
|
| if (_constant == null) {
|
| if (node.isConst) {
|
| _constant = new Constantifier(elementMap).visit(node.initializer);
|
| @@ -904,7 +904,7 @@ class _FieldData extends _MemberData {
|
| }
|
|
|
| class KernelElementEnvironment implements ElementEnvironment {
|
| - final KernelToElementMap elementMap;
|
| + final KernelToElementMapImpl elementMap;
|
|
|
| KernelElementEnvironment(this.elementMap);
|
|
|
| @@ -1078,7 +1078,7 @@ class KernelElementEnvironment implements ElementEnvironment {
|
|
|
| /// Visitor that converts kernel dart types into [DartType].
|
| class DartTypeConverter extends ir.DartTypeVisitor<DartType> {
|
| - final KernelToElementMap elementAdapter;
|
| + final KernelToElementMapImpl elementAdapter;
|
| bool topLevel = true;
|
|
|
| DartTypeConverter(this.elementAdapter);
|
| @@ -1177,7 +1177,7 @@ class KernelBehaviorBuilder extends native.BehaviorBuilder {
|
| /// Constant environment mapping [ConstantExpression]s to [ConstantValue]s using
|
| /// [_EvaluationEnvironment] for the evaluation.
|
| class KernelConstantEnvironment implements ConstantEnvironment {
|
| - KernelToElementMap _worldBuilder;
|
| + KernelToElementMapImpl _worldBuilder;
|
| Map<ConstantExpression, ConstantValue> _valueMap =
|
| <ConstantExpression, ConstantValue>{};
|
|
|
| @@ -1209,7 +1209,7 @@ class KernelConstantEnvironment implements ConstantEnvironment {
|
| /// Evaluation environment used for computing [ConstantValue]s for
|
| /// kernel based [ConstantExpression]s.
|
| class _EvaluationEnvironment implements EvaluationEnvironment {
|
| - final KernelToElementMap _elementMap;
|
| + final KernelToElementMapImpl _elementMap;
|
|
|
| _EvaluationEnvironment(this._elementMap);
|
|
|
| @@ -1243,7 +1243,7 @@ class _EvaluationEnvironment implements EvaluationEnvironment {
|
| }
|
|
|
| class KernelResolutionWorldBuilder extends KernelResolutionWorldBuilderBase {
|
| - final KernelToElementMap elementMap;
|
| + final KernelToElementMapImpl elementMap;
|
|
|
| KernelResolutionWorldBuilder(this.elementMap, NativeBasicData nativeBasicData,
|
| SelectorConstraintsStrategy selectorConstraintsStrategy)
|
| @@ -1286,7 +1286,7 @@ class KernelResolutionWorldBuilder extends KernelResolutionWorldBuilderBase {
|
|
|
| // Interface for testing equivalence of Kernel-based entities.
|
| class WorldDeconstructionForTesting {
|
| - final KernelToElementMap elementMap;
|
| + final KernelToElementMapImpl elementMap;
|
|
|
| WorldDeconstructionForTesting(this.elementMap);
|
|
|
|
|