Dart VM: Simplify token positions in the translation of await.

runtime/vm/ast_transformer.cc

Index: runtime/vm/ast_transformer.cc
diff --git a/runtime/vm/ast_transformer.cc b/runtime/vm/ast_transformer.cc
index 2137931d3acd75f4b2a66044a748573e861fa421..8de7741f348e3a7e79e3dfa63471314f5741d808 100644
--- a/runtime/vm/ast_transformer.cc
+++ b/runtime/vm/ast_transformer.cc
@@ -146,8 +146,8 @@ void AwaitTransformer::VisitAwaitNode(AwaitNode* node) {
       preamble_->scope(), Symbols::AsyncOperationStackTraceParam());
 
   AstNode* transformed_expr = Transform(node->expr());
-  LocalVariable* await_temp = AddNewTempVarToPreamble(transformed_expr,
-                                                      ST(node->token_pos()));
+  LocalVariable* await_temp =
+    AddNewTempVarToPreamble(transformed_expr, token_pos);

[hausner, 2016/04/08 16:43:36]

Nit: indentation should be 4 spaces.

 
   AwaitMarkerNode* await_marker =
       new(Z) AwaitMarkerNode(async_temp_scope_, node->scope(), token_pos);
@@ -220,14 +220,11 @@ void AwaitTransformer::VisitAwaitNode(AwaitNode* node) {
           token_pos,
           Token::kNE,
           load_error_param,
-          new(Z) LiteralNode(token_pos,
-                              Object::null_instance())),
+          new(Z) LiteralNode(token_pos, Object::null_instance())),
           error_ne_null_branch,
           NULL));
 
-  LocalVariable* result = AddNewTempVarToPreamble(new(Z) LoadLocalNode(
-      token_pos, result_param), ST(node->token_pos()));
-  result_ = new(Z) LoadLocalNode(token_pos, result);
+  result_ = MakeName(result_param);

[hausner, 2016/04/08 16:43:36]

How does this work? result_param is a LocalVariable (line 141), not an AstNode,
as expected by MakeName(). 

 }