Remove element from DynamicType.

sdk/lib/_internal/compiler/implementation/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 "elements/elements.dart";
 import "dart2jslib.dart";
 import "dart_types.dart";
 import "scanner/scannerlib.dart" show Token;
@@ skipping 25 matching lines @@
       if (cached != null) return cached;
 
       ClosureTranslator translator =
           new ClosureTranslator(compiler, elements, closureMappingCache, namer);
 
       // The translator will store the computed closure-mappings inside the
       // cache. One for given node and one for each nested closure.
       if (node is FunctionExpression) {
         translator.translateFunction(element, node);
       } else if (element.isSynthesized) {
-        return new ClosureClassMap(null, null, null,
-            new ThisElement(element, compiler.types.dynamicType));
+        return new ClosureClassMap(null, null, null, new ThisElement(element));
       } else {
         assert(element.isField);
         VariableElement field = element;
         if (field.initializer != null) {
           // The lazy initializer of a static.
           translator.translateLazyInitializer(element, node, field.initializer);
         } else {
           assert(element.isInstanceMember);
           closureMappingCache[node] =
-              new ClosureClassMap(null, null, null,
-                  new ThisElement(element, compiler.types.dynamicType));
+              new ClosureClassMap(null, null, null, new ThisElement(element));
         }
       }
       assert(closureMappingCache[node] != null);
       return closureMappingCache[node];
     });
   }
 
   ClosureClassMap getMappingForNestedFunction(FunctionExpression node) {
     return measure(() {
       ClosureClassMap nestedClosureData = closureMappingCache[node];
@@ skipping 95 matching lines @@
 
   get enclosingElement => methodElement;
 
   accept(ElementVisitor visitor) => visitor.visitClosureClassElement(this);
 }
 
 // TODO(ahe): These classes continuously cause problems.  We need to
 // move these classes to elements/modelx.dart or see if we can find a
 // more general solution.
 class BoxElement extends ElementX implements TypedElement {
-  final DartType type;
-
-  BoxElement(String name, Element enclosingElement, this.type)
+  BoxElement(String name, Element enclosingElement)
       : super(name, ElementKind.VARIABLE_LIST, enclosingElement);
 
   DartType computeType(Compiler compiler) => type;
 
+  DartType get type => const DynamicType();
+
   accept(ElementVisitor visitor) => visitor.visitBoxElement(this);
 }
 
 // TODO(ngeoffray, ahe): These classes continuously cause problems.  We need to
 // move these classes to elements/modelx.dart or see if we can find a
 // more general solution.
 class BoxFieldElement extends ElementX implements TypedElement {
   BoxFieldElement(String name,
                   this.variableElement,
                   BoxElement enclosingBox)
       : super(name, ElementKind.FIELD, enclosingBox);
 
   DartType computeType(Compiler compiler) => type;
 
   DartType get type => variableElement.type;
 
   final VariableElement variableElement;
 
   accept(ElementVisitor visitor) => visitor.visitBoxFieldElement(this);
 }
 
 // TODO(ahe): These classes continuously cause problems.  We need to
 // move these classes to elements/modelx.dart or see if we can find a
 // more general solution.
 class ThisElement extends ElementX implements TypedElement {
-  final DartType type;
-
-  ThisElement(Element enclosing, this.type)
+  ThisElement(Element enclosing)
       : super('this', ElementKind.PARAMETER, enclosing);
 
   bool get isAssignable => false;
 
-  DartType computeType(Compiler compiler) => compiler.types.dynamicType;
+  DartType computeType(Compiler compiler) => type;
+
+  DartType get type => const DynamicType();
 
   // Since there is no declaration corresponding to 'this', use the position of
   // the enclosing method.
   Token get position => enclosingElement.position;
 
   accept(ElementVisitor visitor) => visitor.visitThisElement(this);
 }
 
 /// Call method of a closure class.
 class SynthesizedCallMethodElementX extends FunctionElementX {
@@ skipping 406 matching lines @@
     for (Element element in scopeVariables) {
       // No need to box non-assignable elements.
       if (!element.isAssignable) continue;
       if (!mutatedVariables.contains(element)) continue;
       if (capturedVariableMapping.containsKey(element)) {
         if (box == null) {
           // TODO(floitsch): construct better box names.
           String boxName =
               namer.getClosureVariableName('box', closureFieldCounter++);
           box = new BoxElement(
-              boxName, currentElement, compiler.types.dynamicType);
+              boxName, currentElement);
         }
         String elementName = element.name;
         String boxedName =
             namer.getClosureVariableName(elementName, boxedFieldCounter++);
         // TODO(kasperl): Should this be a FieldElement instead?
         Element boxed = new BoxFieldElement(boxedName, element, box);
         // No need to rename the fields of a box, so we give them a native name
         // right now.
         boxed.setFixedBackendName(boxedName);
         scopeMapping[element] = boxed;
@@ skipping 108 matching lines @@
 
     insideClosure = outermostElement != null;
     currentElement = element;
     if (insideClosure) {
       closures.add(node);
       closureData = globalizeClosure(node, element);
     } else {
       outermostElement = element;
       Element thisElement = null;
       if (element.isInstanceMember || element.isGenerativeConstructor) {
-        thisElement = new ThisElement(element, compiler.types.dynamicType);
+        thisElement = new ThisElement(element);
       }
       closureData = new ClosureClassMap(null, null, null, thisElement);
     }
     closureMappingCache[node] = closureData;
 
     inNewScope(node, () {
       // We have to declare the implicit 'this' parameter.
       if (!insideClosure && closureData.thisElement != null) {
         declareLocal(closureData.thisElement);
       }
@@ skipping 74 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 }