Revert "Model 'await for' as an explicit node in tree and fix its handling."

pkg/compiler/lib/src/resolution/members.dart

Index: pkg/compiler/lib/src/resolution/members.dart
diff --git a/pkg/compiler/lib/src/resolution/members.dart b/pkg/compiler/lib/src/resolution/members.dart
index da697606a998ac59767d664a0b83b5d7da1d0866..652387b9ab146828326a32ce5cdb473311b9a15c 100644
--- a/pkg/compiler/lib/src/resolution/members.dart
+++ b/pkg/compiler/lib/src/resolution/members.dart
@@ -3598,21 +3598,8 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
     registry.registerDynamicInvocation(selector);
   }
 
-  visitAsyncForIn(AsyncForIn node) {
-    registry.registerAsyncForIn(node);
-    registry.setCurrentSelector(node, compiler.currentSelector);
-    registry.registerDynamicGetter(compiler.currentSelector);
-    registry.setMoveNextSelector(node, compiler.moveNextSelector);
-    registry.registerDynamicInvocation(compiler.moveNextSelector);
-
-    visit(node.expression);
-
-    Scope blockScope = new BlockScope(scope);
-    visitForInDeclaredIdentifierIn(node.declaredIdentifier, node, blockScope);
-    visitLoopBodyIn(node, node.body, blockScope);
-  }
-
-  visitSyncForIn(SyncForIn node) {
+  visitForIn(ForIn node) {
+    LibraryElement library = enclosingElement.library;
     registry.setIteratorSelector(node, compiler.iteratorSelector);
     registry.registerDynamicGetter(compiler.iteratorSelector);
     registry.setCurrentSelector(node, compiler.currentSelector);
@@ -3621,15 +3608,8 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
     registry.registerDynamicInvocation(compiler.moveNextSelector);
 
     visit(node.expression);
-
     Scope blockScope = new BlockScope(scope);
-    visitForInDeclaredIdentifierIn(node.declaredIdentifier, node, blockScope);
-    visitLoopBodyIn(node, node.body, blockScope);
-  }
-
-  visitForInDeclaredIdentifierIn(Node declaration, ForIn node,
-                                 Scope blockScope) {
-    LibraryElement library = enclosingElement.library;
+    Node declaration = node.declaredIdentifier;
 
     bool oldAllowFinalWithoutInitializer = allowFinalWithoutInitializer;
     allowFinalWithoutInitializer = true;
@@ -3679,6 +3659,7 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
       // loopVariable may be null if it could not be resolved.
       registry.setForInVariable(node, loopVariable);
     }
+    visitLoopBodyIn(node, node.body, blockScope);
   }
 
   visitLabel(Label node) {