Switch from AST node ids to computation ids (cid). In addition to computations,…

runtime/vm/flow_graph_builder.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_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 117 matching lines @@
   // and index and loads the value.  The receiver will be returned in the
   // output parameter 'receiver' and the index will be returned in the
   // output parameter 'index'..
   Definition* BuildIncrOpIndexedLoad(IncrOpIndexedNode* node,
                                      Value** receiver,
                                      Value** index);
 
   // Build the increment part of an increment operation (add or subtract 1).
   // Consumes the original value and produces the value +/- 1.
   Definition* BuildIncrOpIncrement(Token::Kind kind,
-                                   intptr_t node_id,
                                    intptr_t token_index,
                                    Value* original);
 
   // Creates an instantiated type argument vector used in preparation of a
   // factory call.
   // May be called only if allocating an object of a parameterized class.
   Definition* BuildFactoryTypeArguments(ConstructorCallNode* node);
 
   // Creates a possibly uninstantiated type argument vector and the type
   // argument vector of the instantiator (two values in 'args') used in
   // preparation of a constructor call.
   // May be called only if allocating an object of a parameterized class.
   void BuildConstructorTypeArguments(ConstructorCallNode* node,
                                      ZoneGrowableArray<Value*>* args);
 
   // Returns the value of the type arguments of the instantiator.
   Value* BuildInstantiatorTypeArguments(intptr_t token_index,
                                         intptr_t start_index);
 
   // Perform a type check on the given value.
-  void BuildAssertAssignable(intptr_t node_id,
-                             intptr_t token_index,
+  void BuildAssertAssignable(intptr_t token_index,
                              Value* value,
                              const AbstractType& dst_type,
                              const String& dst_name,
                              intptr_t start_index);
 
   // Perform a type check on the given value and return it.
-  Value* BuildAssignableValue(intptr_t assignment_node_id,
-                              AstNode* value_node,
+  Value* BuildAssignableValue(AstNode* value_node,
                               Value* value,
                               const AbstractType& dst_type,
                               const String& dst_name,
                               intptr_t start_index);
 
   virtual void BuildInstanceOf(ComparisonNode* node);
 
   bool MustSaveRestoreContext(SequenceNode* node) const;
 
   // Moves parent context into the context register.
@@ skipping 93 matching lines @@
 //
 // To distinguish between the graphs with only nonlocal exits and graphs
 // with both true and false exits, there are a pair of TargetEntryInstr**:
 //
 //   - Both NULL: only non-local exits, truly closed
 //   - Neither NULL: true and false successors at the given addresses
 //
 // We expect that AstNode in test contexts either have only nonlocal exits
 // or else control flow has both true and false successors.
 //
-// The node_id and token_index are used in checked mode to verify that the
+// The cis and token_index are used in checked mode to verify that the
 // condition of the test is of type bool.
 class TestGraphVisitor : public ValueGraphVisitor {
  public:
   TestGraphVisitor(FlowGraphBuilder* owner,
                    intptr_t temp_index,
-                   intptr_t condition_node_id,
                    intptr_t condition_token_index)
       : ValueGraphVisitor(owner, temp_index),
         true_successor_address_(NULL),
         false_successor_address_(NULL),
-        condition_node_id_(condition_node_id),
         condition_token_index_(condition_token_index) {
   }
 
   TargetEntryInstr** true_successor_address() const {
     ASSERT(true_successor_address_ != NULL);
     return true_successor_address_;
   }
   TargetEntryInstr** false_successor_address() const {
     ASSERT(false_successor_address_ != NULL);
     return false_successor_address_;
   }
 
-  intptr_t condition_node_id() const { return condition_node_id_; }
   intptr_t condition_token_index() const { return condition_token_index_; }
 
  private:
   // Construct and concatenate a Branch instruction to this graph fragment.
   // Closes the fragment and sets the output parameters.
   virtual void ReturnValue(Value* value);
 
   // Specify a computation as the final result.  Adds a Bind instruction to
   // the graph and branches on its value.
   virtual void ReturnComputation(Computation* computation) {
     BindInstr* defn = new BindInstr(temp_index(), computation);
     AddInstruction(defn);
     ReturnValue(new UseVal(defn));
   }
 
   // Output parameters.
   TargetEntryInstr** true_successor_address_;
   TargetEntryInstr** false_successor_address_;
 
-  intptr_t condition_node_id_;
   intptr_t condition_token_index_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_