Eliminate IncrOpStaticFieldNode, replace a set of nodes.

runtime/vm/ast.h

 // 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.
 
 #ifndef VM_AST_H_
 #define VM_AST_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 #include "vm/scopes.h"
 #include "vm/object.h"
 #include "vm/native_entry.h"
 #include "vm/token.h"
 
 namespace dart {
 
 #define NODE_LIST(V)                                                           \
   V(ReturnNode, "return")                                                      \
   V(LiteralNode, "literal")                                                    \
   V(TypeNode, "type")                                                          \
   V(AssignableNode, "assignable")                                              \
   V(BinaryOpNode, "binop")                                                     \
   V(StringConcatNode, "concat")                                                \
   V(ComparisonNode, "compare")                                                 \
   V(UnaryOpNode, "unaryop")                                                    \
   V(IncrOpLocalNode, "incr local")                                             \
   V(IncrOpInstanceFieldNode, "incr instance field")                            \
-  V(IncrOpStaticFieldNode, "incr static field")                                \
   V(IncrOpIndexedNode, "incr indexed")                                         \
   V(ConditionalExprNode, "?:")                                                 \
   V(IfNode, "if")                                                              \
   V(SwitchNode, "switch")                                                      \
   V(CaseNode, "case")                                                          \
   V(WhileNode, "while")                                                        \
   V(DoWhileNode, "dowhile")                                                    \
   V(ForNode, "for")                                                            \
   V(JumpNode, "jump")                                                          \
   V(ArgumentListNode, "args")                                                  \
@@ skipping 712 matching lines @@
   const String& field_name_;
   const intptr_t operator_id_;
   const intptr_t setter_id_;
   ICData& operator_ic_data_;
   ICData& setter_ic_data_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IncrOpInstanceFieldNode);
 };
 
 
-class IncrOpStaticFieldNode : public AstNode {
- public:
-  // Access the static field via a call to static getter.
-  IncrOpStaticFieldNode(intptr_t token_index,
-                        Token::Kind kind,
-                        bool prefix,
-                        const Class& field_class,
-                        const String& field_name)
-      : AstNode(token_index),
-        kind_(kind),
-        prefix_(prefix),
-        field_class_(field_class),
-        field_name_(field_name),
-        field_(Field::ZoneHandle()) {
-    ASSERT(field_class_.IsZoneHandle());
-    ASSERT(field_name_.IsZoneHandle());
-    ASSERT(kind_ == Token::kINCR || kind_ == Token::kDECR);
-  }
-
-  // Access the static field directly.
-  IncrOpStaticFieldNode(intptr_t token_index,
-                        Token::Kind kind,
-                        bool prefix,
-                        const Field& field)
-      : AstNode(token_index),
-        kind_(kind),
-        prefix_(prefix),
-        field_class_(Class::ZoneHandle()),
-        field_name_(String::ZoneHandle()),
-        field_(field) {
-    ASSERT(field_.IsZoneHandle());
-    ASSERT(kind_ == Token::kINCR || kind_ == Token::kDECR);
-  }
-
-  Token::Kind kind() const { return kind_; }
-  bool prefix() const { return prefix_; }
-  const Class& field_class() const { return field_class_; }
-  const String& field_name() const { return field_name_; }
-  const Field& field() const { return field_; }
-
-  virtual void VisitChildren(AstNodeVisitor* visitor) const { }
-
-  virtual const char* Name() const;
-
-  DECLARE_COMMON_NODE_FUNCTIONS(IncrOpStaticFieldNode);
-
- private:
-  const Token::Kind kind_;
-  const bool prefix_;
-  const Class& field_class_;
-  const String& field_name_;
-  const Field& field_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(IncrOpStaticFieldNode);
-};
-
-
 class IncrOpIndexedNode : public AstNode {
  public:
   IncrOpIndexedNode(intptr_t token_index,
                     Token::Kind kind,
                     bool prefix,
                     AstNode* array,
                     AstNode* index)
       : AstNode(token_index),
         kind_(kind),
         prefix_(prefix),
@@ skipping 1085 matching lines @@
   const LocalVariable& context_var_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_