Handle forwarding constructors to unnamed mixin applications

pkg/compiler/lib/src/ssa/builder_kernel.dart

 // Copyright (c) 2016, 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 '../common/codegen.dart' show CodegenRegistry;
 import '../common/names.dart';
@@ skipping 444 matching lines @@
       sourceInformationBuilder = oldSourceInformationBuilder;
       _targetStack.removeLast();
       localsMap.leaveInlinedMember(inlinedTarget);
       return result;
     });
   }
 
   /// Maps the instance fields of a class to their SSA values.
   Map<FieldEntity, HInstruction> _collectFieldValues(ir.Class clazz) {
     Map<FieldEntity, HInstruction> fieldValues = <FieldEntity, HInstruction>{};
-
-    for (ir.Field node in clazz.fields) {
-      if (node.isInstanceMember) {
-        FieldEntity field = _elementMap.getField(node);
-        if (node.initializer == null) {
-          fieldValues[field] = graph.addConstantNull(closedWorld);
-        } else {
-          // Gotta update the resolvedAst when we're looking at field values
-          // outside the constructor.
-          inlinedFrom(field, () {
-            node.initializer.accept(this);
-            fieldValues[field] = pop();
-          });
-        }
+    ClassEntity cls = _elementMap.getClass(clazz);
+    _worldBuilder.forEachInstanceField(cls, (_, FieldEntity field) {
+      MemberDefinition definition = _elementMap.getMemberDefinition(field);
+      ir.Field node;
+      switch (definition.kind) {
+        case MemberKind.regular:
+          node = definition.node;
+          break;
+        default:
+          failedAt(field, "Unexpected member definition $definition.");
       }
-    }
-
+      if (node.initializer == null) {
+        fieldValues[field] = graph.addConstantNull(closedWorld);
+      } else {
+        // Gotta update the current member when we're looking at field values
+        // outside the constructor.
+        inlinedFrom(field, () {
+          node.initializer.accept(this);
+          fieldValues[field] = pop();
+        });
+      }
+    });
     return fieldValues;
   }
 
   /// Collects field initializers all the way up the inheritance chain.
   void _buildInitializers(
       ir.Constructor constructor,
       List<ir.Constructor> constructorChain,
       Map<FieldEntity, HInstruction> fieldValues) {
     assert(
         _elementMap.getConstructor(constructor) == localsMap.currentMember,
@@ skipping 126 matching lines @@
     var target = initializer.target;
     var arguments =
         _normalizeAndBuildArguments(target.function, initializer.arguments);
 
     ir.Class callerClass = caller.enclosingClass;
     _bindSupertypeTypeParameters(callerClass.supertype);
     if (callerClass.mixedInType != null) {
       _bindSupertypeTypeParameters(callerClass.mixedInType);
     }
 
-    ir.Class cls = target.enclosingClass;
-
-    inlinedFrom(_elementMap.getConstructor(target), () {
-      fieldValues.addAll(_collectFieldValues(cls));
-    });
-
     _inlineSuperOrRedirectCommon(
         initializer, target, arguments, constructorChain, fieldValues, caller);
   }
 
   void _inlineSuperOrRedirectCommon(
       ir.Initializer initializer,
       ir.Constructor constructor,
       List<HInstruction> arguments,
       List<ir.Constructor> constructorChain,
       Map<FieldEntity, HInstruction> fieldValues,
@@ skipping 3093 matching lines @@
     enterBlock.setBlockFlow(
         new HTryBlockInformation(
             kernelBuilder.wrapStatementGraph(bodyGraph),
             exception,
             kernelBuilder.wrapStatementGraph(catchGraph),
             kernelBuilder.wrapStatementGraph(finallyGraph)),
         exitBlock);
     kernelBuilder.inTryStatement = previouslyInTryStatement;
   }
 }