Split KernelToElementMap into sub-interfaces

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

Index: pkg/compiler/lib/src/kernel/element_map_impl.dart
diff --git a/pkg/compiler/lib/src/kernel/element_map_impl.dart b/pkg/compiler/lib/src/kernel/element_map_impl.dart
index 49891b478cb7b5e0739f64273cab7991002da148..d588b91098ae974b09740743f4b4f0881faaa480 100644
--- a/pkg/compiler/lib/src/kernel/element_map_impl.dart
+++ b/pkg/compiler/lib/src/kernel/element_map_impl.dart
@@ -48,7 +48,7 @@ part 'no_such_method_resolver.dart';
 part 'types.dart';
 
 /// Interface for kernel queries needed to implement the [CodegenWorldBuilder].
-abstract class KernelToWorldBuilder implements KernelToElementMap {
+abstract class KernelToWorldBuilder implements KernelToElementMapForBuilding {
   /// Returns `true` if [field] has a constant initializer.
   bool hasConstantFieldInitializer(FieldEntity field);
 
@@ -64,7 +64,7 @@ abstract class KernelToWorldBuilder implements KernelToElementMap {
 /// Element builder used for creating elements and types corresponding to Kernel
 /// IR nodes.
 class KernelToElementMapImpl extends KernelToElementMapMixin
-    implements KernelToWorldBuilder {
+    implements KernelToWorldBuilder, KernelToElementMapForImpact {
   final Environment _environment;
   CommonElements _commonElements;
   native.BehaviorBuilder _nativeBehaviorBuilder;
@@ -1112,7 +1112,7 @@ class _FunctionData extends _MemberData {
     return _type ??= elementMap.getFunctionType(functionNode);
   }
 
-  void forEachParameter(KernelToElementMap elementMap,
+  void forEachParameter(KernelToElementMapForBuilding elementMap,
       void f(DartType type, String name, ConstantValue defaultValue)) {
     void handleParameter(ir.VariableDeclaration node, {bool isOptional: true}) {
       DartType type = elementMap.getDartType(node.type);
@@ -1480,7 +1480,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;
+  KernelToElementMapForBuilding _worldBuilder;
   Map<ConstantExpression, ConstantValue> _valueMap =
       <ConstantExpression, ConstantValue>{};
 
@@ -1839,13 +1839,6 @@ class JsKernelToElementMap extends KernelToElementMapMixin
   }
 
   @override
-  ConstructorEntity getSuperConstructor(

[Siggi Cherem (dart-lang), 2017/06/26 18:05:41]

this means that jstoelement-map doesn't need this?

[Johnni Winther, 2017/06/27 08:26:31]

I think it might. We haven't handled explicit super-constructor calls yet. We
re-insert it if necessary.

-      ir.Constructor constructor, ir.Member target) {
-    return _map
-        .toBackendMember(_elementMap.getSuperConstructor(constructor, target));
-  }
-
-  @override
   ConstructorEntity getConstructor(ir.Member node) {
     return _map.toBackendMember(_elementMap.getConstructor(node));
   }