Support supermixins in dart2js

The tests use the old syntax which CFE currently (wrongfully) allows for dart2js.

Change-Id: Ia4dde9e6e1444d8ec22905c36209049bd4161faa
Reviewed-on: https://dart-review.googlesource.com/72443
Commit-Queue: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Stephen Adams <sra@google.com>

Author: johnniwinther

pkg/compiler/lib/src/common_elements.dart

@@ -1481,6 +1481,10 @@ abstract class ElementEnvironment {
   /// Returns `true` if [cls] is an unnamed mixin application.
   bool isUnnamedMixinApplication(ClassEntity cls);
 
+  /// Returns `true` if [cls] is a mixin application that mixes in methods with
+  /// super calls.
+  bool isSuperMixinApplication(ClassEntity cls);
+
   /// Returns the 'effective' mixin class if [cls] is a mixin application, and
   /// `null` otherwise.
   ///

pkg/compiler/lib/src/js_emitter/full_emitter/class_emitter.dart

@@ -42,9 +42,8 @@ class ClassEmitter extends CodeEmitterHelper {
       superName = namer.className(superclass);
     }
 
-    if (cls.isMixinApplication) {
-      MixinApplication mixinApplication = cls;
-      jsAst.Name mixinName = mixinApplication.mixinClass.name;
+    if (cls.mixinClass != null) {
+      jsAst.Name mixinName = cls.mixinClass.name;
       superName = new CompoundName([superName, Namer.literalPlus, mixinName]);
       emitter.needsMixinSupport = true;
     }
@@ -226,7 +225,7 @@ class ClassEmitter extends CodeEmitterHelper {
   void emitInstanceMembers(Class cls, ClassBuilder builder) {
     ClassEntity classElement = cls.element;
 
-    if (cls.onlyForRti || cls.isMixinApplication) return;
+    if (cls.onlyForRti || cls.isSimpleMixinApplication) return;
 
     // TODO(herhut): This is a no-op. Should it be removed?
     for (Field field in cls.fields) {

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

@@ -237,6 +237,7 @@ class Class implements FieldContainer {
   final js.Name name;
   final Holder holder;
   Class _superclass;
+  Class _mixinClass;
   final List<Method> methods;
   final List<Field> fields;
   final List<StubMethod> isChecks;
@@ -259,6 +260,8 @@ class Class implements FieldContainer {
   /// A soft-deferred class is only fully initialized at first instantiation.
   final bool isSoftDeferred;
 
+  final bool isSuperMixinApplication;
+
   // If the class implements a function type, and the type is encoded in the
   // metatada table, then this field contains the index into that field.
   final js.Expression functionTypeIndex;
@@ -292,20 +295,28 @@ class Class implements FieldContainer {
       this.isDirectlyInstantiated,
       this.isNative,
       this.isClosureBaseClass,
-      this.isSoftDeferred = false}) {
+      this.isSoftDeferred = false,
+      this.isSuperMixinApplication}) {
     assert(onlyForRti != null);
     assert(isDirectlyInstantiated != null);
     assert(isNative != null);
     assert(isClosureBaseClass != null);
   }
 
-  bool get isMixinApplication => false;
+  bool get isSimpleMixinApplication => false;
+
   Class get superclass => _superclass;
 
   void setSuperclass(Class superclass) {
     _superclass = superclass;
   }
 
+  Class get mixinClass => _mixinClass;
+
+  void setMixinClass(Class mixinClass) {
+    _mixinClass = mixinClass;
+  }
+
   js.Name get superclassName => superclass == null ? null : superclass.name;
 
   int get superclassHolderIndex =>
@@ -315,8 +326,6 @@ class Class implements FieldContainer {
 }
 
 class MixinApplication extends Class {
-  Class _mixinClass;
-
   MixinApplication(
       ClassEntity element,
       js.Name name,
@@ -346,14 +355,10 @@ class MixinApplication extends Class {
             onlyForRti: onlyForRti,
             isDirectlyInstantiated: isDirectlyInstantiated,
             isNative: false,
-            isClosureBaseClass: false);
-
-  bool get isMixinApplication => true;
-  Class get mixinClass => _mixinClass;
+            isClosureBaseClass: false,
+            isSuperMixinApplication: false);
 
-  void setMixinClass(Class mixinClass) {
-    _mixinClass = mixinClass;
-  }
+  bool get isSimpleMixinApplication => true;
 
   String toString() => 'Mixin(name=${name.key},element=$element)';
 }

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

@@ -257,7 +257,7 @@ class NativeEmitter {
     return cls.methods.isEmpty &&
         cls.isChecks.isEmpty &&
         cls.callStubs.isEmpty &&
-        !cls.superclass.isMixinApplication &&
+        !cls.superclass.isSimpleMixinApplication &&
         !cls.fields.any(needsAccessor);
   }
 

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

@@ -211,7 +211,7 @@ class ProgramBuilder {
                 "No Class for has been created for superclass "
                 "${superclass} of $c."));
       }
-      if (c is MixinApplication) {
+      if (c.isSimpleMixinApplication || c.isSuperMixinApplication) {
         ClassEntity effectiveMixinClass =
             _elementEnvironment.getEffectiveMixinClass(cls);
         c.setMixinClass(_classes[effectiveMixinClass]);
@@ -696,12 +696,26 @@ class ProgramBuilder {
 
     // MixinApplications run through the members of their mixin. Here, we are
     // only interested in direct members.
-    if (!onlyForRti && !_elementEnvironment.isMixinApplication(cls)) {
-      List<MemberEntity> members = <MemberEntity>[];
-      _elementEnvironment.forEachLocalClassMember(cls, members.add);
-      _elementEnvironment.forEachInjectedClassMember(cls, members.add);
-      _elementEnvironment.forEachConstructorBody(cls, members.add);
-      _sorter.sortMembers(members).forEach(visitMember);
+    bool isSuperMixinApplication = false;
+    if (!onlyForRti) {
+      if (_elementEnvironment.isSuperMixinApplication(cls)) {
+        List<MemberEntity> members = <MemberEntity>[];
+        _elementEnvironment.forEachLocalClassMember(cls, (MemberEntity member) {
+          if (member.enclosingClass == cls) {
+            members.add(member);
+            isSuperMixinApplication = true;
+          }
+        });
+        if (members.isNotEmpty) {
+          _sorter.sortMembers(members).forEach(visitMember);
+        }
+      } else if (!_elementEnvironment.isMixinApplication(cls)) {
+        List<MemberEntity> members = <MemberEntity>[];
+        _elementEnvironment.forEachLocalClassMember(cls, members.add);
+        _elementEnvironment.forEachInjectedClassMember(cls, members.add);
+        _elementEnvironment.forEachConstructorBody(cls, members.add);
+        _sorter.sortMembers(members).forEach(visitMember);
+      }
     }
     bool isInterceptedClass = _interceptorData.isInterceptedClass(cls);
     List<Field> instanceFields = onlyForRti
@@ -759,7 +773,9 @@ class ProgramBuilder {
         _worldBuilder.directlyInstantiatedClasses.contains(cls);
 
     Class result;
-    if (_elementEnvironment.isMixinApplication(cls) && !onlyForRti) {
+    if (_elementEnvironment.isMixinApplication(cls) &&
+        !onlyForRti &&
+        !isSuperMixinApplication) {
       assert(!_nativeData.isNativeClass(cls));
       assert(methods.isEmpty);
       assert(!isClosureBaseClass);
@@ -795,7 +811,8 @@ class ProgramBuilder {
           onlyForRti: onlyForRti,
           isNative: _nativeData.isNativeClass(cls),
           isClosureBaseClass: isClosureBaseClass,
-          isSoftDeferred: _isSoftDeferred(cls));
+          isSoftDeferred: _isSoftDeferred(cls),
+          isSuperMixinApplication: isSuperMixinApplication);
     }
     _classes[cls] = result;
     return result;

pkg/compiler/lib/src/js_emitter/startup_emitter/fragment_emitter.dart

@@ -1018,10 +1018,9 @@ class FragmentEmitter {
         if (cls.isSoftDeferred != softDeferred) continue;
         collect(cls);
 
-        if (cls.isMixinApplication) {
-          MixinApplication mixin = cls;
+        if (cls.mixinClass != null) {
           mixinCalls.add(js.js.statement('mixin(#, #)',
-              [classReference(cls), classReference(mixin.mixinClass)]));
+              [classReference(cls), classReference(cls.mixinClass)]));
         }
       }
     }

pkg/compiler/lib/src/kernel/element_map.dart

@@ -501,7 +501,8 @@ SourceSpan computeSourceSpanFromTreeNode(ir.TreeNode node) {
   while (node != null) {
     if (node.fileOffset != ir.TreeNode.noOffset) {
       offset = node.fileOffset;
-      uri = node.location.file;
+      // @patch annotations have no location.
+      uri = node.location?.file;
       break;
     }
     node = node.parent;

pkg/compiler/lib/src/kernel/element_map_impl.dart

@@ -718,6 +718,13 @@ abstract class KernelToElementMapBase extends KernelToElementMapBaseMixin {
     return env.isUnnamedMixinApplication;
   }
 
+  bool _isSuperMixinApplication(IndexedClass cls) {
+    assert(checkFamily(cls));
+    ClassEnv env = _classes.getEnv(cls);
+    env.ensureMembers(this);
+    return env.isSuperMixinApplication;
+  }
+
   void _forEachSupertype(IndexedClass cls, void f(InterfaceType supertype)) {
     assert(checkFamily(cls));
     ClassData data = _classes.getData(cls);
@@ -1513,6 +1520,11 @@ class KernelElementEnvironment extends ElementEnvironment {
     return elementMap._isUnnamedMixinApplication(cls);
   }
 
+  @override
+  bool isSuperMixinApplication(ClassEntity cls) {
+    return elementMap._isSuperMixinApplication(cls);
+  }
+
   @override
   ClassEntity getEffectiveMixinClass(ClassEntity cls) {
     if (!isMixinApplication(cls)) return null;