Big merge from experimental to bleeding edge.

sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart

Index: sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart
diff --git a/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart b/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart
index acff12a5627e9bea6e2d0ac657889110cf0ffad7..269410e23e35a799f637281fd3484ddfe95e5f53 100644
--- a/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart
+++ b/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart
@@ -4,6 +4,7 @@
 
 library mirrors_dart2js;
 
+import 'dart:async';
 import 'dart:io';
 import 'dart:uri';
 
@@ -1304,14 +1305,15 @@ class Dart2JsInterfaceTypeMirror extends Dart2JsTypeElementMirror
     if (originalDeclaration != other.originalDeclaration) {
       return false;
     }
-    var thisTypeArguments = typeArguments.iterator();
-    var otherTypeArguments = other.typeArguments.iterator();
-    while (thisTypeArguments.hasNext && otherTypeArguments.hasNext) {
-      if (thisTypeArguments.next() != otherTypeArguments.next()) {
+    var thisTypeArguments = typeArguments.iterator;
+    var otherTypeArguments = other.typeArguments.iterator;
+    while (thisTypeArguments.moveNext()) {
+      if (!otherTypeArguments.moveNext()) return false;
+      if (thisTypeArguments.current != otherTypeArguments.current) {
         return false;
       }
     }
-    return !thisTypeArguments.hasNext && !otherTypeArguments.hasNext;
+    return !otherTypeArguments.moveNext();
   }
 }
 
@@ -1801,4 +1803,4 @@ class Dart2JsConstructedConstantMirror extends Dart2JsConstantMirror {
     }
     return super.getField(fieldName);
   }
-}
+}