Step toward eliminating increment nodes, starting with increment local. Fix a bug in evaluating sid…

runtime/vm/ast.cc

 // Copyright (c) 2011, 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.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/isolate.h"
 #include "vm/object_store.h"
 
@@ skipping 280 matching lines @@
       return NULL;
   }
 }
 
 
 const char* UnaryOpNode::Name() const {
   return Token::Str(kind_);
 }
 
 
-const char* IncrOpLocalNode::Name() const {
-  switch (kind_) {
-    case Token::kINCR:
-      return prefix_ ? "local_pre_++" : "local_post_++";
-    case Token::kDECR:
-      return prefix_ ? "local_pre_--" : "local_post_--";
-    default:
-      UNREACHABLE();
-      return NULL;
-  }
-}
-
-
 const char* IncrOpInstanceFieldNode::Name() const {
   switch (kind_) {
     case Token::kINCR:
       return prefix_ ? "instance_field_pre_++" : "instance_field_post_++";
     case Token::kDECR:
       return prefix_ ? "instance_field_pre_--" : "instance_field_post_--";
     default:
       UNREACHABLE();
       return NULL;
   }
@@ skipping 15 matching lines @@
       UNREACHABLE();
       return NULL;
   }
 }
 
 
 AstNode* LoadLocalNode::MakeAssignmentNode(AstNode* rhs) {
   if (local().is_final()) {
     return NULL;
   }
+  if (HasPseudo()) {
+    return NULL;
+  }
   return new StoreLocalNode(token_index(), local(), rhs);
 }
 
 
 AstNode* LoadLocalNode::MakeIncrOpNode(intptr_t token_index,
                                        Token::Kind kind,
                                        bool is_prefix) {
   if (local().is_final()) {
     return NULL;
   }
-  return new IncrOpLocalNode(token_index, kind, is_prefix, local());
+  if (is_prefix) {
+    const Instance& literal = Instance::ZoneHandle(Smi::New(1));
+    AstNode* lhs = this;
+    LiteralNode* rhs = new LiteralNode(token_index, literal);
+    Token::Kind binop_kind = (kind == Token::kINCR) ? Token::kADD : Token::kSUB;
+    BinaryOpNode* result = new BinaryOpNode(token_index, binop_kind, lhs, rhs);
+    StoreLocalNode* store = new StoreLocalNode(token_index, local(), result);
+    return store;
+  }
+  UNIMPLEMENTED();
+  return NULL;
 }
 
 
 AstNode* LoadStaticFieldNode::MakeAssignmentNode(AstNode* rhs) {
   return new StoreStaticFieldNode(token_index(), field(), rhs);
 }
 
 
 AstNode* LoadStaticFieldNode::MakeIncrOpNode(intptr_t token_index,
                                              Token::Kind kind,
@@ skipping 88 matching lines @@
     // the Error object directly to the parser.  This will involve
     // replumbing all of the EvalConstExpr methods.
     return NULL;
   }
   Instance& field_value = Instance::ZoneHandle();
   field_value ^= result.raw();
   return &field_value;
 }
 
 }  // namespace dart