- Fix another side effect issue: never add AstNode to sequence unless they are a statement. Added t…

runtime/vm/parser.cc

 // Copyright (c) 2012, 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/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 4411 matching lines @@
 
 
 void Parser::ParseStatementSequence() {
   TRACE_PARSER("ParseStatementSequence");
   const bool dead_code_allowed = true;
   bool abrupt_completing_seen = false;
   while (CurrentToken() != Token::kRBRACE) {
     const intptr_t statement_pos = token_index_;
     AstNode* statement = ParseStatement();
     // Do not add statements with no effect (e.g., LoadLocalNode).
-    if (statement != NULL && !statement->IsLoadLocalNode()) {
+    if ((statement != NULL) && statement->IsLoadLocalNode()) {
+      // Skip load local.
+      statement = statement->AsLoadLocalNode()->pseudo();
+    }
+    if (statement != NULL) {
       if (!dead_code_allowed && abrupt_completing_seen) {
         ErrorMsg(statement_pos, "dead code after abrupt completing statement");
       }
       current_block_->statements->Add(statement);
       abrupt_completing_seen |= IsAbruptCompleting(statement);
     }
   }
 }
 
 
@@ skipping 2177 matching lines @@
       ErrorMsg("expression is not assignable");
     }
     ConsumeToken();
     // Not prefix.
     if (postfix_expr->IsLoadStaticFieldNode() ||
         postfix_expr->IsStaticGetterNode()) {
       LocalVariable* temp = CreateTempConstVariable(
           postfix_expr_pos, postfix_expr->id(), "incoplix");
       AstNode* save =
           new StoreLocalNode(postfix_expr_pos, *temp, postfix_expr);
-      current_block_->statements->Add(save);
-      LoadLocalNode* load = new LoadLocalNode(postfix_expr_pos, *temp);
       Token::Kind binary_op =
           (incr_op == Token::kINCR) ? Token::kADD : Token::kSUB;
       BinaryOpNode* add = new BinaryOpNode(
           postfix_expr_pos,
           binary_op,
-          load,
+          save,
           new LiteralNode(postfix_expr_pos, Smi::ZoneHandle(Smi::New(1))));
       AstNode* store = postfix_expr->MakeAssignmentNode(add);
-      current_block_->statements->Add(store);
-      LoadLocalNode* load_res = new LoadLocalNode(postfix_expr_pos, *temp);
+      LoadLocalNode* load_res =
+          new LoadLocalNode(postfix_expr_pos, *temp, store);
       return load_res;
     } else {
       AstNode* incr_op_node =
           postfix_expr->MakeIncrOpNode(postfix_expr_pos, incr_op, false);
       if (incr_op_node == NULL) {
         Unimplemented("incr op not implemented");
       }
       postfix_expr = incr_op_node;
     }
   }
@@ skipping 1772 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart