Support forEachClassMember on closure classes

pkg/compiler/lib/src/js_emitter/metadata_collector.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 dart2js.js_emitter.metadata_collector;
 
 import 'package:js_ast/src/precedence.dart' as js_precedence;
 
 import '../common.dart';
 import '../constants/values.dart';
 import '../deferred_load.dart' show DeferredLoadTask, OutputUnit;
 import '../elements/elements.dart'
     show
         ClassElement,
         ConstructorElement,
         Element,
         FieldElement,
         FunctionSignature,
         LibraryElement,
         MemberElement,
         MethodElement,
         MetadataAnnotation,
         ParameterElement;
 import '../elements/entities.dart';
 import '../elements/resolution_types.dart'
     show ResolutionDartType, ResolutionTypedefType;

[Emily Fortuna, 2017/08/02 17:49:55]

you can remove ResolutionDartType here then.

[Johnni Winther, 2017/08/03 08:58:34]

Done.

 import '../elements/types.dart';
 import '../js/js.dart' as jsAst;
 import '../js/js.dart' show js;
 import '../js_backend/constant_handler_javascript.dart';
 import '../js_backend/mirrors_data.dart';
 import '../js_backend/runtime_types.dart' show RuntimeTypesEncoder;
 import '../js_backend/type_variable_handler.dart'
     show TypeVariableCodegenAnalysis;
 import '../options.dart';
 
@@ skipping 123 matching lines @@
   /// output unit. Once finalized, the entries represent types including
   /// function types and typedefs.
   Map<OutputUnit, _MetadataList> _typesTokens =
       new Map<OutputUnit, _MetadataList>();
 
   jsAst.Expression getTypesForOutputUnit(OutputUnit outputUnit) {
     return _typesTokens.putIfAbsent(outputUnit, () => new _MetadataList());
   }
 
   /// A map used to canonicalize the entries of types.
-  Map<OutputUnit, Map<ResolutionDartType, _BoundMetadataEntry>> _typesMap =
-      <OutputUnit, Map<ResolutionDartType, _BoundMetadataEntry>>{};
+  Map<OutputUnit, Map<DartType, _BoundMetadataEntry>> _typesMap =
+      <OutputUnit, Map<DartType, _BoundMetadataEntry>>{};
 
   MetadataCollector(
       this._options,
       this.reporter,
       this._deferredLoadTask,
       this._emitter,
       this._constants,
       this._typeVariableCodegenAnalysis,
       this._mirrorsData,
       this._rtiEncoder) {
@@ skipping 144 matching lines @@
       return null;
     }
     return _addGlobalMetadata(_emitter.constantReference(constant));
   }
 
   jsAst.Expression reifyType(DartType type, {ignoreTypeVariables: false}) {
     return reifyTypeForOutputUnit(type, _deferredLoadTask.mainOutputUnit,
         ignoreTypeVariables: ignoreTypeVariables);
   }
 
-  jsAst.Expression reifyTypeForOutputUnit(
-      ResolutionDartType type, OutputUnit outputUnit,
+  jsAst.Expression reifyTypeForOutputUnit(DartType type, OutputUnit outputUnit,
       {ignoreTypeVariables: false}) {
     return addTypeInOutputUnit(type, outputUnit,
         ignoreTypeVariables: ignoreTypeVariables);
   }
 
   jsAst.Expression reifyName(String name) {
     return _addGlobalMetadata(js.string(name));
   }
 
   jsAst.Expression reifyExpression(jsAst.Expression expression) {
     return _addGlobalMetadata(expression);
   }
 
   Placeholder getMetadataPlaceholder([debug]) {
     return new _ForwardingMetadataEntry(debug);
   }
 
   _MetadataEntry _addGlobalMetadata(jsAst.Node node) {
     String nameToKey(jsAst.Name name) => "${name.key}";
     String printed =
         jsAst.prettyPrint(node, _options, renamerForNames: nameToKey);
     return _globalMetadataMap.putIfAbsent(printed, () {
       return new _BoundMetadataEntry(node);
     });
   }
 
-  jsAst.Expression _computeTypeRepresentation(ResolutionDartType type,
+  jsAst.Expression _computeTypeRepresentation(DartType type,
       {ignoreTypeVariables: false}) {
     jsAst.Expression representation =
         _rtiEncoder.getTypeRepresentation(_emitter, type, (variable) {
       if (ignoreTypeVariables) return new jsAst.LiteralNull();
       return _typeVariableCodegenAnalysis.reifyTypeVariable(variable.element);
     }, (ResolutionTypedefType typedef) {
       return _mirrorsData.isTypedefAccessibleByReflection(typedef.element);
     });
 
     if (representation is jsAst.LiteralString) {
       // We don't want the representation to be a string, since we use
       // strings as indicator for non-initialized types in the lazy emitter.
       reporter.internalError(
           NO_LOCATION_SPANNABLE, 'reified types should not be strings.');
     }
 
     return representation;
   }
 
-  jsAst.Expression addTypeInOutputUnit(
-      ResolutionDartType type, OutputUnit outputUnit,
+  jsAst.Expression addTypeInOutputUnit(DartType type, OutputUnit outputUnit,
       {ignoreTypeVariables: false}) {
     if (_typesMap[outputUnit] == null) {
-      _typesMap[outputUnit] =
-          new Map<ResolutionDartType, _BoundMetadataEntry>();
+      _typesMap[outputUnit] = new Map<DartType, _BoundMetadataEntry>();
     }
     return _typesMap[outputUnit].putIfAbsent(type, () {
       return new _BoundMetadataEntry(_computeTypeRepresentation(type,
           ignoreTypeVariables: ignoreTypeVariables));
     });
   }
 
   List<jsAst.DeferredNumber> computeMetadata(MethodElement element) {
     return reporter.withCurrentElement(element, () {
       if (!_mustEmitMetadataForMember(element))
@@ skipping 71 matching lines @@
     if (token is _ForwardingMetadataEntry && !token.isBound) {
       _foundUnboundToken = true;
     }
   }
 
   bool findUnboundPlaceholders(jsAst.Node node) {
     node.accept(this);
     return _foundUnboundToken;
   }
 }