Handle named mixin application in emitter

pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart

 // Copyright (c) 2014, 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.js_emitter.program_builder;
 
 import 'dart:io';
 import 'dart:convert' show JSON;
 
 import '../../closure.dart' show ClosureTask, ClosureFieldElement;
@@ skipping 40 matching lines @@
 import '../../native/enqueue.dart' show NativeCodegenEnqueuer;
 import '../../options.dart';
 import '../../universe/selector.dart' show Selector;
 import '../../universe/world_builder.dart'
     show CodegenWorldBuilder, SelectorConstraints;
 import '../../world.dart' show ClosedWorld;
 import '../js_emitter.dart'
     show
         ClassStubGenerator,
         CodeEmitterTask,
-        computeMixinClass,
         Emitter,
         InterceptorStubGenerator,
         MainCallStubGenerator,
         ParameterStubGenerator,
         RuntimeTypeGenerator,
         TypeTestProperties;
 import '../model.dart';
 import '../sorter.dart';
 
 part 'collector.dart';
@@ skipping 155 matching lines @@
       if (superclass != null) {
         c.setSuperclass(_classes[superclass]);
         assert(
             c.superclass != null,
             failedAt(
                 cls,
                 "No Class for has been created for superclass "
                 "${superclass} of $c."));
       }
       if (c is MixinApplication) {
-        c.setMixinClass(_classes[computeMixinClass(cls)]);
-        assert(c.mixinClass != null);
+        ClassEntity effectiveMixinClass =
+            _elementEnvironment.getEffectiveMixinClass(cls);
+        c.setMixinClass(_classes[effectiveMixinClass]);
+        assert(
+            c.mixinClass != null,
+            failedAt(cls,
+                "No class for effective mixin ${effectiveMixinClass} on $cls."));

[Emily Fortuna, 2017/06/13 17:22:50]

nit: >80 char here

       }
     });
 
     List<Class> nativeClasses = collector.nativeClassesAndSubclasses
         .map((ClassEntity classElement) => _classes[classElement])
         .toList();
 
     Set<ClassEntity> interceptorClassesNeededByConstants =
         collector.computeInterceptorsReferencedFromConstants();
     Set<ClassEntity> classesModifiedByEmitRTISupport =
@@ skipping 71 matching lines @@
       }
 
       String data = new File(allocatedClassesPath).readAsStringSync();
       Set<String> allocatedClassesKeys = JSON.decode(data).keys.toSet();
       Set<ClassElement> allocatedClasses = new Set<ClassElement>();
 
       // Collects all super and mixin classes of a class.
       void collect(ClassElement element) {
         allocatedClasses.add(element);
         if (element.isMixinApplication) {
-          collect(computeMixinClass(element));
+          collect(_elementEnvironment.getEffectiveMixinClass(element));
         }
         if (element.superclass != null) {
           collect(element.superclass);
         }
       }
 
       // For every known class, see if it was allocated in the profile. If yes,
       // collect its dependencies (supers and mixins) and mark them as
       // not-soft-deferrable.
       collector.outputClassLists.forEach((_, List<ClassElement> elements) {
@@ skipping 395 matching lines @@
 
     if (isClosureBaseClass) {
       // We add a special getter to allow for tearing off a closure from itself.
       js.Name name = _namer.getterForMember(Names.call);
       js.Fun function = js.js('function() { return this; }');
       callStubs.add(_buildStubMethod(name, function));
     }
 
     // MixinApplications run through the members of their mixin. Here, we are
     // only interested in direct members.
-    if (!onlyForRti && !_elementEnvironment.isUnnamedMixinApplication(cls)) {
+    if (!onlyForRti && !_elementEnvironment.isMixinApplication(cls)) {
       _elementEnvironment.forEachClassMember(cls, visitMember);
       if (cls is ClassElement) {
         // TODO(johnniwinther): Support constructor bodies for entities.
         cls.forEachConstructorBody((ConstructorBodyElement constructorBody) =>
             visitMember(cls, constructorBody));
       }
     }
     bool isInterceptedClass = _interceptorData.isInterceptedClass(cls);
     List<Field> instanceFields = onlyForRti
         ? const <Field>[]
@@ skipping 38 matching lines @@
 
     js.Name name = _namer.className(cls);
     String holderName = _namer.globalObjectForClass(cls);
     // TODO(floitsch): we shouldn't update the registry in the middle of
     // building a class.
     Holder holder = _registry.registerHolder(holderName);
     bool isInstantiated = !_nativeData.isJsInteropClass(cls) &&
         _worldBuilder.directlyInstantiatedClasses.contains(cls);
 
     Class result;
-    if (_elementEnvironment.isUnnamedMixinApplication(cls) && !onlyForRti) {
+    if (_elementEnvironment.isMixinApplication(cls) && !onlyForRti) {
       assert(!_nativeData.isNativeClass(cls));
       assert(methods.isEmpty);
       assert(!isClosureBaseClass);
 
       result = new MixinApplication(
           cls,
           name,
           holder,
           instanceFields,
           staticFieldsForReflection,
@@ skipping 364 matching lines @@
       Constant constant = new Constant(name, holder, constantValue);
       _constants[constantValue] = constant;
     }
   }
 
   Holder _registerStaticStateHolder() {
     return _registry.registerHolder(_namer.staticStateHolder,
         isStaticStateHolder: true);
   }
 }