Add Class/MemberDefinition to handle synthesized classes/members

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/codegen.dart' show CodegenRegistry, CodegenWorkItem;
@@ skipping 76 matching lines @@
 
   KernelSsaBuilder(
       this.task, this._compiler, this._elementMap, this._globalLocalsMap);
 
   @override
   HGraph build(CodegenWorkItem work, ClosedWorld closedWorld) {
     KernelToLocalsMap localsMap = _globalLocalsMap.getLocalsMap(work.element);
     KernelSsaGraphBuilder builder = new KernelSsaGraphBuilder(
         work.element,
         work.element.enclosingClass,
-        _elementMap.getMemberNode(work.element),
         _compiler,
         _elementMap,
         new KernelToTypeInferenceMapImpl(closedWorld),
         localsMap,
         closedWorld,
         _compiler.codegenWorldBuilder,
         work.registry,
         _compiler.backendStrategy.closureDataLookup,
         // TODO(redemption): Support these:
         const SourceInformationBuilder(),
@@ skipping 89 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 _compareNodes(
-      Entity entity1, ir.TreeNode node1, Entity entity2, ir.TreeNode node2) {
-    ir.Location location1 = node1.location;
-    ir.Location location2 = node2.location;
+  int _compareLocations(Entity entity1, ir.Location location1, Entity entity2,
+      ir.Location location2) {
     int r = utils.compareSourceUris(
         Uri.parse(location1.file), Uri.parse(location2.file));
     if (r != 0) return r;
     return utils.compareEntities(entity1, location1.line, location1.column,
         entity2, location2.line, location2.column);
   }
 
   @override
   Iterable<LibraryEntity> sortLibraries(Iterable<LibraryEntity> libraries) {
     return libraries.toList()..sort(_compareLibraries);
   }
 
   @override
   Iterable<MemberEntity> sortMembers(Iterable<MemberEntity> members) {
     return members.toList()
-      ..sort((MemberEntity a, MemberEntity b) {
-        int r = _compareLibraries(a.library, b.library);
+      ..sort((MemberEntity member1, MemberEntity member2) {
+        int r = _compareLibraries(member1.library, member2.library);
         if (r != 0) return r;
-        return _compareNodes(
-            a, elementMap.getMemberNode(a), b, elementMap.getMemberNode(b));
+        MemberDefinition definition1 = elementMap.getMemberDefinition(member1);
+        MemberDefinition definition2 = elementMap.getMemberDefinition(member2);
+        return _compareLocations(
+            member1, definition1.location, member2, definition2.location);
       });
   }
 
   @override
   Iterable<ClassEntity> sortClasses(Iterable<ClassEntity> classes) {
     return classes.toList()
-      ..sort((ClassEntity a, ClassEntity b) {
-        int r = _compareLibraries(a.library, b.library);
+      ..sort((ClassEntity cls1, ClassEntity cls2) {
+        int r = _compareLibraries(cls1.library, cls2.library);
         if (r != 0) return r;
-        return _compareNodes(
-            a, elementMap.getClassNode(a), b, elementMap.getClassNode(b));
+        ClassDefinition definition1 = elementMap.getClassDefinition(cls1);
+        ClassDefinition definition2 = elementMap.getClassDefinition(cls2);
+        return _compareLocations(
+            cls1, definition1.location, cls2, definition2.location);
       });
   }
 
   @override
   Iterable<TypedefEntity> sortTypedefs(Iterable<TypedefEntity> typedefs) {
     // TODO(redemption): Support this.
     assert(typedefs.isEmpty);
     return typedefs;
   }
 }