Fix await x++

runtime/vm/ast_transformer.cc

 // 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.
 
 #include "vm/ast_transformer.h"
 
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/thread.h"
 
@@ skipping 522 matching lines @@
       new(Z) StaticSetterNode(node->token_pos(),
                               new_receiver,
                               node->cls(),
                               node->field_name(),
                               new_value));
   result_ = new(Z) LoadLocalNode(Scanner::kNoSourcePos, result);
 }
 
 
 void AwaitTransformer::VisitLoadLocalNode(LoadLocalNode* node) {
-  LocalVariable* result = AddToPreambleNewTempVar(
-      new(Z) LoadLocalNode(node->token_pos(), &node->local()));
-  result_ = new(Z) LoadLocalNode(Scanner::kNoSourcePos, result);
+  result_ = node;
 }
 
 
 void AwaitTransformer::VisitStoreLocalNode(StoreLocalNode* node) {
   AstNode* new_value = Transform(node->value());
-  LocalVariable* result = AddToPreambleNewTempVar(
-      new(Z) StoreLocalNode(node->token_pos(),
-                            &node->local(),
-                            new_value));
-  result_ = new(Z) LoadLocalNode(Scanner::kNoSourcePos, result);
+  result_ = new(Z) StoreLocalNode(node->token_pos(), &node->local(), new_value);
 }
 
 
 void AwaitTransformer::VisitLoadStaticFieldNode(LoadStaticFieldNode* node) {
-  LocalVariable* result = AddToPreambleNewTempVar(
-      new(Z) LoadStaticFieldNode(node->token_pos(),
-                                 node->field()));
-  result_ = new(Z) LoadLocalNode(Scanner::kNoSourcePos, result);
+  result_ = node;
 }
 
 
 void AwaitTransformer::VisitStoreStaticFieldNode(StoreStaticFieldNode* node) {
   AstNode* new_value = Transform(node->value());
-  LocalVariable* result = AddToPreambleNewTempVar(
-      new(Z) StoreStaticFieldNode(node->token_pos(),
-                                  node->field(),
-                                  new_value));
-  result_ = new(Z) LoadLocalNode(Scanner::kNoSourcePos, result);
+  result_ = new(Z) StoreStaticFieldNode(node->token_pos(),
+                                        node->field(),
+                                        new_value);
 }
 
 
 void AwaitTransformer::VisitLoadIndexedNode(LoadIndexedNode* node) {
   AstNode* new_array = Transform(node->array());
   AstNode* new_index = Transform(node->index_expr());
   LocalVariable* result = AddToPreambleNewTempVar(
       new(Z) LoadIndexedNode(node->token_pos(),
                              new_array,
                              new_index,
@@ skipping 21 matching lines @@
   LocalVariable* result = AddToPreambleNewTempVar(
       new(Z) AssignableNode(node->token_pos(),
                             new_expr,
                             node->type(),
                             node->dst_name()));
   result_ = new(Z) LoadLocalNode(Scanner::kNoSourcePos, result);
 }
 
 
 void AwaitTransformer::VisitLetNode(LetNode* node) {
-  // TODO(mlippautz): Check initializers and their temps.
+  // Add all the initializer nodes and their temporary variables
+  // to the preamble. The temporary variables will be captured
+  // as a side effect of being added to a scope, and the subsequent
+  // nodes that are added to the preample can access them.
+  for (intptr_t i = 0; i < node->num_temps(); i++) {
+    preamble_->scope()->AddVariable(node->TempAt(i));
+    AstNode* new_init_val = Transform(node->InitializerAt(i));
+    preamble_->Add(new(Z) StoreLocalNode(node->token_pos(),
+                   node->TempAt(i),
+                   new_init_val));
+  }
+  // The transformed LetNode does not have any temporary variables.
   LetNode* result = new(Z) LetNode(node->token_pos());
   for (intptr_t i = 0; i < node->nodes().length(); i++) {
     result->AddNode(Transform(node->nodes()[i]));
   }
   result_ = result;
 }
 
 
 void AwaitTransformer::VisitThrowNode(ThrowNode* node) {
   AstNode* new_exception = Transform(node->exception());
   result_ = new(Z) ThrowNode(node->token_pos(),
                              new_exception,
                              node->stacktrace());
 }
 
 }  // namespace dart