Move local properties to KernelToLocalsMap

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.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../common/names.dart';
 import '../constants/constructors.dart';
 import '../constants/expressions.dart';
 import '../constants/values.dart';
 import '../common_elements.dart';
+import '../elements/elements.dart' show JumpTarget;
 import '../elements/entities.dart';
 import '../elements/names.dart';
 import '../elements/operators.dart';
 import '../elements/types.dart';
 import '../js_backend/backend.dart' show JavaScriptBackend;
 import '../native/native.dart' as native;
 import '../types/types.dart';
 import '../universe/call_structure.dart';
 import '../universe/selector.dart';
 import '../world.dart';
@@ skipping 125 matching lines @@
   /// Computes the [ConstantValue] for the constant [expression].
   ConstantValue getConstantValue(ir.Expression expression);
 
   /// Returns the `noSuchMethod` [FunctionEntity] call from a
   /// `super.noSuchMethod` invocation within [cls].
   FunctionEntity getSuperNoSuchMethod(ClassEntity cls);
 
   /// Returns a [Spannable] for a message pointing to the IR [node] in the
   /// context of [member].
   Spannable getSpannable(MemberEntity member, ir.Node node);
-
-  // TODO(johnniwinther): Move these to a `KernelToLocalsMap`, maybe even make

[Siggi Cherem (dart-lang), 2017/06/01 22:13:40]

now I understand what you meant with the TODO!

seems like you agree with me :)

-  // the return the `KernelToLocalsMap` to use from now on.
-  /// Call to notify that [member] is currently being inlined.
-  void enterInlinedMember(MemberEntity member);
-
-  /// Call to notify that [member] is no longer being inlined.
-  void leaveInlinedMember(MemberEntity member);
 }
 
 /// Kinds of foreign functions.
 enum ForeignKind {
   JS,
   JS_BUILTIN,
   JS_EMBEDDED_GLOBAL,
   JS_INTERCEPTOR_CONSTANT,
   NONE,
 }
@@ skipping 334 matching lines @@
         // `Object.superNoSuchMethod`.
         break;
       }
     }
     FunctionEntity function = elementEnvironment.lookupClassMember(
         commonElements.objectClass, Identifiers.noSuchMethod_);
     assert(invariant(cls, function != null,
         message: "No super noSuchMethod found for class $cls."));
     return function;
   }
-
-  @override
-  void enterInlinedMember(MemberEntity member) {}
-
-  @override
-  void leaveInlinedMember(MemberEntity member) {}
 }
 
 /// Visitor that converts string literals and concatenations of string literals
 /// into the string value.
 class Stringifier extends ir.ExpressionVisitor<String> {
   @override
   String visitStringLiteral(ir.StringLiteral node) => node.value;
 
   @override
   String visitStringConcatenation(ir.StringConcatenation node) {
@@ skipping 409 matching lines @@
   TypeMask getInferredTypeOf(MemberEntity member);
 
   /// Returns the inferred type of a dynamic [selector] access on a receiver of
   /// type [mask].
   TypeMask selectorTypeOf(Selector selector, TypeMask mask);
 
   /// Returns the returned type annotation in the [nativeBehavior].
   TypeMask typeFromNativeBehavior(
       native.NativeBehavior nativeBehavior, ClosedWorld closedWorld);
 }
+
+/// Map from kernel IR nodes to local entities.
+abstract class KernelToLocalsMap {
+  // TODO(johnniwinther): Make these return the [KernelToLocalsMap] to use from
+  // now on.
+  /// Call to notify that [member] is currently being inlined.
+  void enterInlinedMember(MemberEntity member);
+
+  /// Call to notify that [member] is no longer being inlined.
+  void leaveInlinedMember(MemberEntity member);
+
+  /// Returns the [Local] for [node].
+  Local getLocal(ir.VariableDeclaration node);
+
+  /// Returns the [JumpTarget] for the branch in [node].
+  // TODO(johnniwinther): Split this by kind of [node]?
+  JumpTarget getJumpTarget(ir.TreeNode node, {bool isContinueTarget: false});
+}