Support forEachClassMember on closure classes

pkg/compiler/lib/src/kernel/kernel_backend_strategy.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.backend_strategy;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../backend_strategy.dart';
+import '../common.dart';
 import '../common/codegen.dart' show CodegenRegistry, CodegenWorkItem;
 import '../common/tasks.dart';
 import '../compiler.dart';
 import '../elements/entities.dart';
 import '../elements/entity_utils.dart' as utils;
 import '../enqueue.dart';
 import '../io/source_information.dart';
 import '../js_backend/backend.dart';
 import '../js_emitter/sorter.dart';
 import '../js_model/js_strategy.dart';
@@ skipping 176 matching lines @@
 
 class KernelSorter implements Sorter {
   final KernelToElementMapForBuilding elementMap;
 
   KernelSorter(this.elementMap);
 
   int _compareLibraries(LibraryEntity a, LibraryEntity b) {
     return utils.compareLibrariesUris(a.canonicalUri, b.canonicalUri);
   }
 
-  int _compareLocations(Entity entity1, ir.Location location1, Entity entity2,
-      ir.Location location2) {
-    int r = utils.compareSourceUris(
-        Uri.parse(location1.file), Uri.parse(location2.file));
+  int _compareSourceSpans(Entity entity1, SourceSpan sourceSpan1,
+      Entity entity2, SourceSpan sourceSpan2) {
+    int r = utils.compareSourceUris(sourceSpan1.uri, sourceSpan2.uri);
     if (r != 0) return r;
-    return utils.compareEntities(entity1, location1.line, location1.column,
-        entity2, location2.line, location2.column);
+    return utils.compareEntities(
+        entity1, sourceSpan1.begin, null, entity2, sourceSpan2.begin, null);
   }
 
   @override
   Iterable<LibraryEntity> sortLibraries(Iterable<LibraryEntity> libraries) {
     return libraries.toList()..sort(_compareLibraries);
   }
 
   @override
   Iterable<MemberEntity> sortMembers(Iterable<MemberEntity> members) {
     return members.toList()
       ..sort((MemberEntity member1, MemberEntity member2) {
         int r = _compareLibraries(member1.library, member2.library);
         if (r != 0) return r;
         MemberDefinition definition1 = elementMap.getMemberDefinition(member1);
         MemberDefinition definition2 = elementMap.getMemberDefinition(member2);
-        return _compareLocations(
+        return _compareSourceSpans(
             member1, definition1.location, member2, definition2.location);
       });
   }
 
   @override
   Iterable<ClassEntity> sortClasses(Iterable<ClassEntity> classes) {
     return classes.toList()
       ..sort((ClassEntity cls1, ClassEntity cls2) {
         int r = _compareLibraries(cls1.library, cls2.library);
         if (r != 0) return r;
         ClassDefinition definition1 = elementMap.getClassDefinition(cls1);
         ClassDefinition definition2 = elementMap.getClassDefinition(cls2);
-        return _compareLocations(
+        return _compareSourceSpans(
             cls1, definition1.location, cls2, definition2.location);
       });
   }
 
   @override
   Iterable<TypedefEntity> sortTypedefs(Iterable<TypedefEntity> typedefs) {
     // TODO(redemption): Support this.
     assert(typedefs.isEmpty);
     return typedefs;
   }
 }