Implement implicit constructors in mixin applications.

sdk/lib/_internal/compiler/implementation/ssa/builder.dart

 // Copyright (c) 2012, 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.
 
 part of ssa;
 
 /**
  * A special element for the extra parameter taken by intercepted
  * methods. We need to override [Element.computeType] because our
  * optimizers may look at its declared type.
@@ skipping 87 matching lines @@
         compiler.tracer.traceCompilation(name, work.compilationContext);
         compiler.tracer.traceGraph('builder', graph);
       }
       return graph;
     });
   }
 
   HGraph compileConstructor(SsaBuilder builder, CodegenWorkItem work) {
     // The body of the constructor will be generated in a separate function.
     final ClassElement classElement = work.element.getEnclosingClass();
+    FunctionElement constructor = work.element.implementation;
     return builder.buildFactory(classElement.implementation,
-                                work.element.implementation);
+                                constructor);

[ahe, 2013/04/15 13:36:46]

Why this change?

[karlklose, 2013/04/25 11:25:53]

Reverted.

   }
 }
 
 
 /**
  * Keeps track of locals (including parameters and phis) when building. The
  * 'this' reference is treated as parameter and hence handled by this class,
  * too.
  */
 class LocalsHandler {
@@ skipping 1128 matching lines @@
         // Don't forget to update the field, if the parameter is of the
         // form [:this.x:].
         if (parameter.kind == ElementKind.FIELD_PARAMETER) {
           FieldParameterElement fieldParameterElement = parameter;
           fieldValues[fieldParameterElement.fieldElement] = argument;
         }
       });
 
       // Build the initializers in the context of the new constructor.
       TreeElements oldElements = elements;
+      if (constructor is ForwardingConstructorElement) {

[ahe, 2013/04/15 13:36:46]

Is there a method you can call?

+        constructor = constructor.superConstructor;
+      }
       elements =
           compiler.enqueuer.resolution.getCachedElements(constructor);
-
       ClosureClassMap oldClosureData = localsHandler.closureData;
       Node node = constructor.parseNode(compiler);
       ClosureClassMap newClosureData =
           compiler.closureToClassMapper.computeClosureToClassMapping(
               constructor, node, elements);
       // The [:this:] element now refers to the one in the new closure
       // data, that is the [:this:] of the super constructor. We
       // update the element to refer to the current [:this:].
       localsHandler.updateLocal(newClosureData.thisElement,
                                 localsHandler.readThis());
@@ skipping 1563 matching lines @@
                                     List<HInstruction> list) {
     assert(invariant(element, element.isImplementation));
 
     HInstruction compileArgument(Node argument) {
       visit(argument);
       return pop();
     }
 
     HInstruction handleConstant(Element parameter) {
       Constant constant;
+      if (element is ForwardingConstructorElement) {

[ahe, 2013/04/15 13:36:46]

Is there a method you can call?

+        element = element.superConstructor;
+      }
       TreeElements calleeElements =
           compiler.enqueuer.resolution.getCachedElements(element);
       if (calleeElements.isParameterChecked(parameter)) {
         constant = SentinelConstant.SENTINEL;
       } else {
         constant = compileConstant(parameter);
       }
       return graph.addConstant(constant);
     }
 
@@ skipping 507 matching lines @@
       } else if (element.isGenerativeConstructor()) {
         ClassElement cls = element.getEnclosingClass();
         return new HType.nonNullExact(cls.thisType, compiler);
       } else {
         return HType.UNKNOWN;
       }
     }
 
     Element constructor = elements[node];
     Selector selector = elements.getSelector(node);
+    if (constructor is ForwardingConstructorElement) {

[ahe, 2013/04/15 13:36:46]

Is there a method you can call?

+      compiler.unimplemented('forwarded constructor in named mixin application',
+                             element: constructor.superConstructor);

[ahe, 2013/04/15 13:36:46]

I don't think this position is helpful.  It doesn't tell you where the problem
is.

[karlklose, 2013/04/25 11:25:53]

Changed to the enclosing class.

+    }
     if (compiler.enqueuer.resolution.getCachedElements(constructor) == null) {
       compiler.internalError("Unresolved element: $constructor", node: node);
     }
     FunctionElement functionElement = constructor;
     constructor = functionElement.redirectionTarget;
     // TODO(5346): Try to avoid the need for calling [declaration] before
     // creating an [HStatic].
     HInstruction target = new HStatic(constructor.declaration);
     add(target);
     var inputs = <HInstruction>[];
@@ skipping 1850 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }