A step towards handling `new Object()` in compile_from_dill_test

pkg/compiler/lib/src/closure.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 closureToClassMapper;
 
 import 'common/names.dart' show Identifiers;
 import 'common/resolution.dart' show ParsingContext, Resolution;
 import 'common/tasks.dart' show CompilerTask;
 import 'common.dart';
@@ skipping 132 matching lines @@
 
   /// Use [closureClass] instead.
   @deprecated
   get enclosingElement => super.enclosingElement;
 
   ClosureClassElement get closureClass => super.enclosingElement;
 
   MemberElement get memberContext => closureClass.methodElement.memberContext;
 
   @override
-  Entity get declaredEntity => local;
+  Local get declaredEntity => local;
+
   @override
   Entity get rootOfScope => closureClass;
 
   bool get hasNode => false;
 
   Node get node {
     throw new SpannableAssertionFailure(
         local, 'Should not access node of ClosureFieldElement.');
   }
 
@@ skipping 121 matching lines @@
   @override
   MemberElement get memberContext => executableContext.memberContext;
 
   String toString() => 'BoxLocal($name)';
 }
 
 // TODO(ngeoffray, ahe): These classes continuously cause problems.  We need to
 // find a more general solution.
 class BoxFieldElement extends ElementX
     implements TypedElement, FieldElement, PrivatelyNamedJSEntity {
+  final LocalVariableElement variableElement;
   final BoxLocal box;
 
   BoxFieldElement(String name, this.variableElement, BoxLocal box)
       : this.box = box,
         super(name, ElementKind.FIELD, box.executableContext);
 
   ResolutionDartType computeType(Resolution resolution) => type;
 
   ResolutionDartType get type => variableElement.type;
 
   @override
-  Entity get declaredEntity => variableElement;
+  Local get declaredEntity => variableElement;
+
   @override
   Entity get rootOfScope => box;
 
-  final VariableElement variableElement;
-
   accept(ElementVisitor visitor, arg) {
     return visitor.visitBoxFieldElement(this, arg);
   }
 
   @override
   bool get hasNode => false;
 
   @override
   bool get hasResolvedAst => false;
 
@@ skipping 914 matching lines @@
     sb.write('#');
     sb.write(name);
     sb.write(')');
     return sb.toString();
   }
 }
 
 ///
 /// Move the below classes to a JS model eventually.
 ///
-abstract class JSEntity implements Entity {
-  Entity get declaredEntity;
+abstract class JSEntity implements MemberEntity {
+  Local get declaredEntity;
 }
 
 abstract class PrivatelyNamedJSEntity implements JSEntity {
   Entity get rootOfScope;
 }