fix to run against latest analyzer

lib/src/codegen/js_codegen.dart

 // Copyright (c) 2015, 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.
 
 import 'dart:collection' show HashSet, HashMap, SplayTreeSet;
 
 import 'package:analyzer/analyzer.dart' hide ConstantEvaluator;
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/visitor.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/ast/ast.dart' hide ConstantEvaluator;
 import 'package:analyzer/src/generated/constant.dart';
 //TODO(leafp): Remove deprecated dependency
 //ignore: DEPRECATED_MEMBER_USE
 import 'package:analyzer/src/generated/element.dart'
     show DynamicElementImpl, DynamicTypeImpl, LocalVariableElementImpl;
-// TODO(jmesserly): we can remove this when ResolutionCopier is fixed.
-import 'package:analyzer/src/dart/ast/ast.dart' show FunctionBodyImpl;
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
-import 'package:analyzer/src/generated/parser.dart' show ResolutionCopier;
 import 'package:analyzer/src/generated/resolver.dart' show TypeProvider;
 import 'package:analyzer/src/dart/ast/token.dart'
     show StringToken, Token, TokenType;
 import 'package:analyzer/src/generated/type_system.dart'
     show StrongTypeSystemImpl;
 import 'package:analyzer/src/task/strong/info.dart';
 
 import 'ast_builder.dart' show AstBuilder;
 import 'reify_coercions.dart' show CoercionReifier, Tuple2;
 
@@ skipping 99 matching lines @@
     var context = compiler.context;
     var src = context.sourceFactory.forUri('dart:_interceptors');
     var interceptors = context.computeLibraryElement(src);
     _jsArray = interceptors.getType('JSArray');
     _isDartRuntime = currentLibrary.source.uri.toString() == 'dart:_runtime';
   }
 
   TypeProvider get types => _types;
 
   JS.Program emitLibrary(List<CompilationUnit> units) {
-    // Copy the AST before modifying it.
-    units = units.map(_cloneCompilationUnit).toList();
-
     // Modify the AST to make coercions explicit.
-    new CoercionReifier().reify(units);
+    units = new CoercionReifier().reify(units);
 
     units.last.directives.forEach(_visit);
 
     // Rather than directly visit declarations, we instead use [_loader] to
     // visit them. It has the ability to sort elements on demand, so
     // dependencies between top level items are handled with a minimal
     // reordering of the user's input code. The loader will call back into
     // this visitor via [_emitModuleItem] when it's ready to visit the item
     // for real.
     _loader.collectElements(currentLibrary, units);
@@ skipping 2183 matching lines @@
   /// Emits static fields.
   ///
   /// Instance fields are emitted in [_initializeFields].
   ///
   /// These are generally treated the same as top-level fields, see
   /// [visitTopLevelVariableDeclaration].
   @override
   visitFieldDeclaration(FieldDeclaration node) {
     if (!node.isStatic) return;
 
-    for (var f in node.fields.variables) {
-      _loader.loadDeclaration(f, f.element);
-    }
+    node.fields.variables.forEach(_emitModuleItem);

[Jennifer Messerly, 2016/03/28 18:33:17]

This is a small cleanup. It's actually what I originally started the CL for :)

I was trying to understand why static fields were going through the loader, that
seemed like a no-op. The answer is yes, it's a no-op :)

   }
 
   _addExport(String name, [String exportName]) {
     if (_exports.containsKey(name)) {
       throw 'Duplicate top level name found: $name';
     }
     _exports[name] = exportName ?? name;
   }
 
   @override
@@ skipping 813 matching lines @@
     var init = _visit(node.identifier);
     if (init == null) {
       init = js.call('let #', node.loopVariable.identifier.name);
     }
     return new JS.ForOf(init, _visit(node.iterable), _visitScope(node.body));
   }
 
   JS.Statement _emitAwaitFor(ForEachStatement node) {
     // Emits `await for (var value in stream) ...`, which desugars as:
     //
-    // var iter = new StreamIterator<T>(stream);
+    // var iter = new StreamIterator(stream);
     // try {
     //   while (await iter.moveNext()) {
     //     var value = iter.current;
     //     ...
     //   }
     // } finally {
     //   await iter.cancel();
     // }
     //
     // Like the Dart VM, we call cancel() always, as it's safe to call if the
     // stream has already been cancelled.
     //
     // TODO(jmesserly): we may want a helper if these become common. For now the
     // full desugaring seems okay.
     var context = compiler.context;
     var dart_async = context
         .computeLibraryElement(context.sourceFactory.forUri('dart:async'));
-    var T = node.loopVariable.element.type;
-    var StreamIterator_T =
-        dart_async.getType('StreamIterator').type.instantiate([T]);
+    var _streamIteratorType =
+        rules.instantiateToBounds(dart_async.getType('StreamIterator').type);
 
     var createStreamIter = _emitInstanceCreationExpression(
-        StreamIterator_T.element.unnamedConstructor,
-        StreamIterator_T,
+        _streamIteratorType.element.unnamedConstructor,
+        _streamIteratorType,
         null,
         AstBuilder.argumentList([node.iterable]),
         false);
     var iter =
-        _visit(_createTemporary('it', StreamIterator_T, nullable: false));
+        _visit(_createTemporary('it', _streamIteratorType, nullable: false));
 
     var init = _visit(node.identifier);
     if (init == null) {
       init = js
           .call('let # = #.current', [node.loopVariable.identifier.name, iter]);
     } else {
       init = js.call('# = #.current', [init, iter]);
     }
     return js.statement(
         '{'
@@ skipping 612 matching lines @@
 
 /// A special kind of element created by the compiler, signifying a temporary
 /// variable. These objects use instance equality, and should be shared
 /// everywhere in the tree where they are treated as the same variable.
 class TemporaryVariableElement extends LocalVariableElementImpl {
   TemporaryVariableElement.forNode(Identifier name) : super.forNode(name);
 
   int get hashCode => identityHashCode(this);
   bool operator ==(Object other) => identical(this, other);
 }
-
-CompilationUnit _cloneCompilationUnit(CompilationUnit unit) {
-  var result = new _TreeCloner().visitCompilationUnit(unit);
-  ResolutionCopier.copyResolutionData(unit, result);
-  return result;
-}
-
-class _TreeCloner extends AstCloner {
-  void _cloneProperties(AstNode clone, AstNode node) {
-    if (clone != null) {
-      CoercionInfo.set(clone, CoercionInfo.get(node));
-      DynamicInvoke.set(clone, DynamicInvoke.get(node));
-    }
-  }
-
-  @override
-  AstNode cloneNode(AstNode node) {
-    var clone = super.cloneNode(node);
-    _cloneProperties(clone, node);
-    return clone;
-  }
-
-  @override
-  List cloneNodeList(List list) {
-    var clone = super.cloneNodeList(list);
-    for (int i = 0, len = list.length; i < len; i++) {
-      _cloneProperties(clone[i], list[i]);
-    }
-    return clone;
-  }
-
-  // TODO(jmesserly): ResolutionCopier is not copying this yet.
-  @override
-  BlockFunctionBody visitBlockFunctionBody(BlockFunctionBody node) {
-    var clone = super.visitBlockFunctionBody(node);
-    (clone as FunctionBodyImpl).localVariableInfo =
-        (node as FunctionBodyImpl).localVariableInfo;
-    return clone;
-  }
-
-  @override
-  ExpressionFunctionBody visitExpressionFunctionBody(
-      ExpressionFunctionBody node) {
-    var clone = super.visitExpressionFunctionBody(node);
-    (clone as FunctionBodyImpl).localVariableInfo =
-        (node as FunctionBodyImpl).localVariableInfo;
-    return clone;
-  }
-}