Reapply (plus add some more) Entity-ify some portions of LocalsHandler and Closure.

pkg/compiler/lib/src/inferrer/locals_handler.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 locals_handler;
 
 import 'dart:collection' show IterableMixin;
 
 import '../options.dart' show CompilerOptions;
 import '../elements/elements.dart';
@@ skipping 227 matching lines @@
 }
 
 /**
  * Placeholder for inferred types of local variables.
  */
 class LocalsHandler {
   final CompilerOptions options;
   final TypeSystem types;
   final InferrerEngine inferrer;
   final VariableScope locals;
-  final Map<Local, Element> captured;
-  final Map<Local, Element> capturedAndBoxed;
+  final Map<Local, FieldEntity> captured;
+  final Map<Local, FieldEntity> capturedAndBoxed;
   final FieldInitializationScope fieldScope;
   LocalsHandler tryBlock;
   bool seenReturnOrThrow = false;
   bool seenBreakOrContinue = false;
 
   bool get aborts {
     return seenReturnOrThrow || seenBreakOrContinue;
   }
 
   bool get inTryBlock => tryBlock != null;
 
   LocalsHandler(this.inferrer, this.types, this.options, Node block,
       [this.fieldScope])
       : locals = new VariableScope(block),
-        captured = new Map<Local, Element>(),
-        capturedAndBoxed = new Map<Local, Element>(),
+        captured = new Map<Local, FieldEntity>(),
+        capturedAndBoxed = new Map<Local, FieldEntity>(),
         tryBlock = null;
 
   LocalsHandler.from(LocalsHandler other, Node block,
       {bool useOtherTryBlock: true})
       : locals = new VariableScope(block, other.locals),
         fieldScope = new FieldInitializationScope.from(other.fieldScope),
         captured = other.captured,
         capturedAndBoxed = other.capturedAndBoxed,
         types = other.types,
         inferrer = other.inferrer,
@@ skipping 72 matching lines @@
         tryBlock.locals.parent[local] = inputType;
       }
       // Update the current handler unconditionnally with the new
       // type.
       updateLocal();
     } else {
       updateLocal();
     }
   }
 
-  void setCaptured(Local local, Element field) {
+  void setCaptured(Local local, FieldEntity field) {
     captured[local] = field;
   }
 
-  void setCapturedAndBoxed(Local local, Element field) {
+  void setCapturedAndBoxed(Local local, FieldEntity field) {
     capturedAndBoxed[local] = field;
   }
 
   void mergeDiamondFlow(LocalsHandler thenBranch, LocalsHandler elseBranch) {
     if (fieldScope != null && elseBranch != null) {
       fieldScope.mergeDiamondFlow(thenBranch.fieldScope, elseBranch.fieldScope);
     }
     seenReturnOrThrow = thenBranch.seenReturnOrThrow &&
         elseBranch != null &&
         elseBranch.seenReturnOrThrow;
@@ skipping 170 matching lines @@
       if (newType != type) {
         locals[variable] = newType;
       }
     });
   }
 
   void updateField(Element element, TypeInformation type) {
     fieldScope.updateField(element, type);
   }
 }