Use the correct current element when computing the type of function elements.

lib/compiler/implementation/elements/elements.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.
 
 #library('elements');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
 #import('../leg.dart');  // TODO(karlklose): we only need type.
 #import('../util/util.dart');
@@ skipping 476 matching lines @@
              Compiler compiler,
              LibraryElement library) {
   // TODO(karlklose,ngeoffray): This method should be removed and the
   // information should be computed by the resolver.
 
   if (typeAnnotation == null || typeAnnotation.typeName == null) {
     return compiler.types.dynamicType;
   }
   Identifier identifier = typeAnnotation.typeName.asIdentifier();
   if (identifier === null) {
-    compiler.reportWarning(typeAnnotation.typeName,
-                           'library prefixes not handled');
+    compiler.reportWarning(
+      typeAnnotation.typeName,
+      new ResolutionWarning(MessageKind.GENERIC,
+                            ['library prefixes not handled']));
     return compiler.types.dynamicType;
   }
   SourceString name = identifier.source;
   Element element = library.find(name);
   if (element !== null) {
     if (element.isTypedef()) {
       // TODO(ngeoffray): This is a hack to help us get support for the
       // DOM library.
       // TODO(ngeoffray): The list of types for the argument is wrong.
       return new FunctionType(compiler.types.dynamicType,
@@ skipping 103 matching lines @@
   int optionalParameterCount(Compiler compiler) {
     return computeParameters(compiler).optionalParameterCount;
   }
 
   int parameterCount(Compiler compiler) {
     return computeParameters(compiler).parameterCount;
   }
 
   FunctionType computeType(Compiler compiler) {
     if (type != null) return type;
-    FunctionParameters parameters = computeParameters(compiler);
-    Types types = compiler.types;
-    FunctionExpression node =
-        compiler.parser.measure(() => parseNode(compiler));
-    Type returnType = getType(node.returnType, compiler, getLibrary());
-    if (returnType === null) returnType = types.dynamicType;
+    return compiler.withCurrentElement(this, () {
+      FunctionParameters parameters = computeParameters(compiler);
+      Types types = compiler.types;
+      FunctionExpression node =
+          compiler.parser.measure(() => parseNode(compiler));
+      Type returnType = getType(node.returnType, compiler, getLibrary());
+      if (returnType === null) returnType = types.dynamicType;
 
-    LinkBuilder<Type> parameterTypes = new LinkBuilder<Type>();
-    for (Link<Element> link = parameters.requiredParameters;
-         !link.isEmpty();
-         link = link.tail) {
-      parameterTypes.addLast(link.head.computeType(compiler));
-    }
-    type = new FunctionType(returnType, parameterTypes.toLink(), this);
-    return type;
+      LinkBuilder<Type> parameterTypes = new LinkBuilder<Type>();
+      for (Link<Element> link = parameters.requiredParameters;
+           !link.isEmpty();
+           link = link.tail) {
+        parameterTypes.addLast(link.head.computeType(compiler));
+      }
+      type = new FunctionType(returnType, parameterTypes.toLink(), this);
+      return type;
+    });
   }
 
   Node parseNode(DiagnosticListener listener) => cachedNode;
 
   Token position() => cachedNode.getBeginToken();
 }
 
 class ConstructorBodyElement extends FunctionElement {
   FunctionElement constructor;
 
@@ skipping 380 matching lines @@
   final Node node;
   Type bound;
   Type type;
   TypeVariableElement(name, Element enclosing, this.node, this.type,
                       [this.bound])
     : super(name, ElementKind.TYPE_VARIABLE, enclosing);
   Type computeType(compiler) => type;
   Node parseNode(compiler) => node;
   toString() => "${enclosingElement.toString()}.${name.slowToString()}";
 }