When recording the type of a captured variable/parameter, use the closure field it maps to. Otherwi…

sdk/lib/_internal/compiler/implementation/elements/modelx.dart

 // Copyright (c) 2013, 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.modelx;
 
 import 'dart:uri';
 import 'dart:collection' show LinkedHashMap;
 
 import 'elements.dart';
@@ skipping 66 matching lines @@
       identical(kind, ElementKind.GENERATIVE_CONSTRUCTOR_BODY);
   bool isCompilationUnit() => identical(kind, ElementKind.COMPILATION_UNIT);
   bool isClass() => identical(kind, ElementKind.CLASS);
   bool isPrefix() => identical(kind, ElementKind.PREFIX);
   bool isVariable() => identical(kind, ElementKind.VARIABLE);
   bool isParameter() => identical(kind, ElementKind.PARAMETER);
   bool isStatement() => identical(kind, ElementKind.STATEMENT);
   bool isTypedef() => identical(kind, ElementKind.TYPEDEF);
   bool isTypeVariable() => identical(kind, ElementKind.TYPE_VARIABLE);
   bool isField() => identical(kind, ElementKind.FIELD);
+  bool isFieldParameter() => identical(kind, ElementKind.FIELD_PARAMETER);
   bool isAbstractField() => identical(kind, ElementKind.ABSTRACT_FIELD);
   bool isGetter() => identical(kind, ElementKind.GETTER);
   bool isSetter() => identical(kind, ElementKind.SETTER);
   bool isAccessor() => isGetter() || isSetter();
   bool isLibrary() => identical(kind, ElementKind.LIBRARY);
   bool impliesType() => (kind.category & ElementCategory.IMPLIES_TYPE) != 0;
 
   /** See [ErroneousElement] for documentation. */
   bool isErroneous() => false;
 
@@ skipping 1992 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }