Introduce TypedefEntity

pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart

 // Copyright (c) 2014, 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.full_emitter;
 
 import 'dart:collection' show HashMap;
 import 'dart:convert';
 
 import 'package:js_runtime/shared/embedded_names.dart' as embeddedNames;
 import 'package:js_runtime/shared/embedded_names.dart'
     show JsBuiltin, JsGetName;
 
 import '../../../compiler_new.dart';
 import '../../common.dart';
 import '../../compiler.dart' show Compiler;
 import '../../constants/values.dart';
 import '../../common_elements.dart' show CommonElements, ElementEnvironment;
-import '../../elements/resolution_types.dart' show ResolutionDartType;
 import '../../deferred_load.dart' show OutputUnit;
-import '../../elements/elements.dart' show LibraryElement, TypedefElement;
 import '../../elements/entities.dart';
 import '../../elements/entity_utils.dart' as utils;
+import '../../elements/types.dart';
 import '../../elements/names.dart';
 import '../../hash/sha1.dart' show Hasher;
 import '../../io/code_output.dart';
 import '../../io/location_provider.dart' show LocationCollector;
 import '../../io/source_map_builder.dart' show SourceMapBuilder;
 import '../../js/js.dart' as jsAst;
 import '../../js/js.dart' show js;
 import '../../js_backend/js_backend.dart'
     show
         ConstantEmitter,
@@ skipping 50 matching lines @@
 
 class Emitter extends js_emitter.EmitterBase {
   final Compiler compiler;
   final CodeEmitterTask task;
   final ClosedWorld _closedWorld;
 
   // The following fields will be set to copies of the program-builder's
   // collector.
   Map<OutputUnit, List<FieldEntity>> outputStaticNonFinalFieldLists;
   Map<OutputUnit, Set<LibraryEntity>> outputLibraryLists;
-  List<TypedefElement> typedefsNeededForReflection;
+  List<TypedefEntity> typedefsNeededForReflection;
 
   final ContainerBuilder containerBuilder = new ContainerBuilder();
   final ClassEmitter classEmitter;
   final NsmEmitter nsmEmitter;
   final InterceptorEmitter interceptorEmitter;
   final Sorter _sorter;
 
   // TODO(johnniwinther): Wrap these fields in a caching strategy.
   final List<jsAst.Statement> cachedEmittedConstantsAst = <jsAst.Statement>[];
 
@@ skipping 401 matching lines @@
       } else if (selector.isSetter) {
         return _getReflectionSetterName(selector.memberName, mangledName);
       } else {
         return _getReflectionFunctionName(
             selector.memberName, selector.callStructure);
       }
     }
     return null;
   }
 
-  /// Returns the "reflection name" of a [TypedefElement], if needed.
+  /// Returns the "reflection name" of a [TypedefEntity], if needed.
   ///
   /// The reflection name of typedef 'F' is 'F'.
   ///
   /// This is used by js_mirrors.dart.
   String getReflectionTypedefName(
-      TypedefElement typedef, jsAst.Name mangledName) {
+      TypedefEntity typedef, jsAst.Name mangledName) {
     String name = typedef.name;
     if (backend.mirrorsData.shouldRetainName(name)) {
       // TODO(ahe): Enable the next line when I can tell the difference between
       // an instance method and a global.  They may have the same mangled name.
       // if (recordedMangledNames.contains(mangledName)) return null;
       recordedMangledNames.add(mangledName);
       return typedef.name;
     }
     return null;
   }
@@ skipping 617 matching lines @@
     cspPrecompiledConstructorNamesFor(outputUnit).add(js('#', constructorName));
   }
 
   void assembleTypedefs(Program program) {
     Fragment mainFragment = program.mainFragment;
     OutputUnit mainOutputUnit = mainFragment.outputUnit;
 
     // Emit all required typedef declarations into the main output unit.
     // TODO(karlklose): unify required classes and typedefs to declarations
     // and have builders for each kind.
-    for (TypedefElement typedef in typedefsNeededForReflection) {
-      LibraryElement library = typedef.library;
+    for (TypedefEntity typedef in typedefsNeededForReflection) {
+      LibraryEntity library = typedef.library;
       // TODO(karlklose): add a TypedefBuilder and move this code there.
-      ResolutionDartType type = typedef.alias;
+      FunctionType type = _elementEnvironment.getFunctionTypeOfTypedef(typedef);
       // TODO(zarah): reify type variables once reflection on type arguments of
       // typedefs is supported.
       jsAst.Expression typeIndex =
           task.metadataCollector.reifyType(type, ignoreTypeVariables: true);
       ClassBuilder builder = new ClassBuilder.forStatics(typedef, namer);
       builder.addPropertyByName(
           embeddedNames.TYPEDEF_TYPE_PROPERTY_NAME, typeIndex);
       builder.addPropertyByName(
           embeddedNames.TYPEDEF_PREDICATE_PROPERTY_NAME, js.boolean(true));
 
@@ skipping 789 matching lines @@
     // data.
     mapping["_comment"] = "This mapping shows which compiled `.js` files are "
         "needed for a given deferred library import.";
     mapping.addAll(compiler.deferredLoadTask.computeDeferredMap());
     compiler.outputProvider(
         compiler.options.deferredMapUri.path, '', OutputType.info)
       ..add(const JsonEncoder.withIndent("  ").convert(mapping))
       ..close();
   }
 }