Support forEachClassMember on closure classes

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 '../closure.dart';
 import '../common.dart';
 import '../constants/values.dart';
 import '../common_elements.dart';
@@ skipping 213 matching lines @@
   MemberKind get kind;
 
   /// The defining [ir.Node] for this member, if supported by its [kind].
   ///
   /// For a regular class this is the [ir.Class] node. For closure classes this
   /// might be an [ir.FunctionExpression] node if needed.
   ir.Node get node;
 
   /// The canonical location of [member]. This is used for sorting the members
   /// in the emitted code.
-  ir.Location get location;
+  SourceSpan get location;
 }
 
 enum ClassKind {
   regular,
   closure,
 }
 
 /// A member directly defined by its [ir.Member] node.
 class RegularMemberDefinition implements MemberDefinition {
   final MemberEntity member;
   final ir.Member node;
 
   RegularMemberDefinition(this.member, this.node);
 
-  ir.Location get location => node.location;
+  SourceSpan get location => computeSourceSpanFromTreeNode(node);
 
   MemberKind get kind => MemberKind.regular;
 
   String toString() => 'RegularMemberDefinition(kind:$kind,member:$member,'
       'node:$node,location:$location)';
 }
 
 /// The definition of a special kind of member
 class SpecialMemberDefinition implements MemberDefinition {
   final MemberEntity member;
   final ir.TreeNode node;
   final MemberKind kind;
 
   SpecialMemberDefinition(this.member, this.node, this.kind);
 
-  ir.Location get location => node.location;
+  SourceSpan get location => computeSourceSpanFromTreeNode(node);
 
   String toString() => 'SpecialMemberDefinition(kind:$kind,member:$member,'
       'node:$node,location:$location)';
 }
 
 /// Definition information for a [ClassEntity].
 abstract class ClassDefinition {
   /// The defined class.
   ClassEntity get cls;
 
   /// The kind of the defined class. This determines the semantics of [node].
   ClassKind get kind;
 
   /// The defining [ir.Node] for this class, if supported by its [kind].
   ir.Node get node;
 
   /// The canonical location of [cls]. This is used for sorting the classes
   /// in the emitted code.
-  ir.Location get location;
+  SourceSpan get location;
 }
 
 /// A class directly defined by its [ir.Class] node.
 class RegularClassDefinition implements ClassDefinition {
   final ClassEntity cls;
   final ir.Class node;
 
   RegularClassDefinition(this.cls, this.node);
 
-  ir.Location get location => node.location;
+  SourceSpan get location => computeSourceSpanFromTreeNode(node);
 
   ClassKind get kind => ClassKind.regular;
 
   String toString() => 'RegularClassDefinition(kind:$kind,cls:$cls,'
       'node:$node,location:$location)';
 }
 
 /// Kinds of foreign functions.
 enum ForeignKind {
   JS,
@@ skipping 119 matching lines @@
   /// [closureClassMaps].
   CapturedLoopScope getCapturedLoopScope(
       ClosureDataLookup closureLookup, ir.TreeNode node);
 }
 
 /// Comparator for the canonical order or named arguments.
 // TODO(johnniwinther): Remove this when named parameters are sorted in dill.
 int namedOrdering(ir.VariableDeclaration a, ir.VariableDeclaration b) {
   return a.name.compareTo(b.name);
 }
+
+SourceSpan computeSourceSpanFromTreeNode(ir.TreeNode node) {
+  // TODO(johnniwinther): Use [ir.Location] directly as a [SourceSpan].
+  Uri uri;
+  int offset;
+  while (node != null) {
+    if (node.fileOffset != ir.TreeNode.noOffset) {
+      offset = node.fileOffset;
+      uri = Uri.parse(node.location.file);
+      break;
+    }
+    node = node.parent;
+  }
+  if (uri != null) {
+    return new SourceSpan(uri, offset, offset + 1);
+  }
+  return null;
+}