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

runtime/vm/intermediate_language.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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 50 matching lines @@
   M(CloneContext, CloneContextComp)                                            \
   M(CatchEntry, CatchEntryComp)                                                \
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 class Computation : public ZoneAllocated {
  public:
-  Computation() { }
+  static const int kNoCid = -1;
+
+  Computation() : cid_(GetNextCid()) { }
+
+  // Unique computation/instruction id, used for deoptimization.
+  intptr_t cid() const { return cid_; }
 
   // Visiting support.
   virtual void Accept(FlowGraphVisitor* visitor) = 0;
 
  private:
+  friend class Instruction;
+  static intptr_t GetNextCid() {
+    Isolate* isolate = Isolate::Current();
+    intptr_t tmp = isolate->computation_id();
+    isolate->set_computation_id(tmp + 1);
+    return tmp;
+  }
+
+  const intptr_t cid_;
+
   DISALLOW_COPY_AND_ASSIGN(Computation);
 };
 
 
 class Value : public Computation {
  public:
   Value() { }
 
 #define DEFINE_TESTERS(ShortName, ClassName)                                   \
   virtual ClassName* As##ShortName() { return NULL; }                          \
@@ skipping 64 matching lines @@
   const Object& value_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstantVal);
 };
 
 #undef DECLARE_VALUE
 
 
 class AssertAssignableComp : public Computation {
  public:
-  AssertAssignableComp(intptr_t node_id,
-                       intptr_t token_index,
+  AssertAssignableComp(intptr_t token_index,
                        intptr_t try_index,
                        Value* value,
                        Value* instantiator_type_arguments,  // Can be NULL.
                        const AbstractType& dst_type,
                        const String& dst_name)
-      : node_id_(node_id),
-        token_index_(token_index),
+      : token_index_(token_index),
         try_index_(try_index),
         value_(value),
         instantiator_type_arguments_(instantiator_type_arguments),
         dst_type_(dst_type),
         dst_name_(dst_name) {
     ASSERT(value_ != NULL);
     ASSERT(!dst_type.IsNull());
     ASSERT(!dst_name.IsNull());
   }
 
   DECLARE_COMPUTATION(AssertAssignable)
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   Value* value() const { return value_; }
   Value* instantiator_type_arguments() const {
     return instantiator_type_arguments_;
   }
   const AbstractType& dst_type() const { return dst_type_; }
   const String& dst_name() const { return dst_name_; }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* value_;
   Value* instantiator_type_arguments_;
   const AbstractType& dst_type_;
   const String& dst_name_;
 
   DISALLOW_COPY_AND_ASSIGN(AssertAssignableComp);
 };
 
 
 class AssertBooleanComp : public Computation {
  public:
-  AssertBooleanComp(intptr_t node_id,
-                    intptr_t token_index,
+  AssertBooleanComp(intptr_t token_index,
                     intptr_t try_index,
                     Value* value)
-      : node_id_(node_id),
-        token_index_(token_index),
+      : token_index_(token_index),
         try_index_(try_index),
         value_(value) {
     ASSERT(value_ != NULL);
   }
 
   DECLARE_COMPUTATION(AssertBoolean)
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   Value* value() const { return value_; }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* value_;
 
   DISALLOW_COPY_AND_ASSIGN(AssertBooleanComp);
 };
 
 
 // Denotes the current context, normally held in a register.  This is
 // a computation, not a value, because it's mutable.
@@ skipping 53 matching lines @@
   const intptr_t try_index_;
   Value* context_;
   ZoneGrowableArray<Value*>* arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(ClosureCallComp);
 };
 
 
 class InstanceCallComp : public Computation {
  public:
-  InstanceCallComp(intptr_t node_id,
-                   intptr_t token_index,
+  InstanceCallComp(intptr_t token_index,
                    intptr_t try_index,
                    const String& function_name,
                    ZoneGrowableArray<Value*>* arguments,
                    const Array& argument_names,
                    intptr_t checked_argument_count)
-      : node_id_(node_id),
-        token_index_(token_index),
+      : token_index_(token_index),
         try_index_(try_index),
         function_name_(function_name),
         arguments_(arguments),
         argument_names_(argument_names),
         checked_argument_count_(checked_argument_count) {
     ASSERT(function_name.IsZoneHandle());
     ASSERT(!arguments->is_empty());
     ASSERT(argument_names.IsZoneHandle());
   }
 
   DECLARE_COMPUTATION(InstanceCall)
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   const String& function_name() const { return function_name_; }
   intptr_t ArgumentCount() const { return arguments_->length(); }
   Value* ArgumentAt(intptr_t index) const { return (*arguments_)[index]; }
   const Array& argument_names() const { return argument_names_; }
   intptr_t checked_argument_count() const { return checked_argument_count_; }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   const String& function_name_;
   ZoneGrowableArray<Value*>* const arguments_;
   const Array& argument_names_;
   const intptr_t checked_argument_count_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceCallComp);
 };
 
@@ skipping 15 matching lines @@
   const Token::Kind kind_;
   Value* left_;
   Value* right_;
 
   DISALLOW_COPY_AND_ASSIGN(StrictCompareComp);
 };
 
 
 class EqualityCompareComp : public Computation {
  public:
-  EqualityCompareComp(intptr_t node_id,
-                      intptr_t token_index,
+  EqualityCompareComp(intptr_t token_index,
                       intptr_t try_index,
                       Value* left,
                       Value* right)
-    : node_id_(node_id),
-      token_index_(token_index),
+    : token_index_(token_index),
       try_index_(try_index),
       left_(left),
       right_(right) {
     ASSERT(left_ != NULL);
     ASSERT(right_ != NULL);
   }
 
   DECLARE_COMPUTATION(EqualityCompareComp)
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   Value* left() const { return left_; }
   Value* right() const { return right_; }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* left_;
   Value* right_;
 
   DISALLOW_COPY_AND_ASSIGN(EqualityCompareComp);
 };
 
 
 class StaticCallComp : public Computation {
@@ skipping 132 matching lines @@
   StoreInstanceFieldComp(StoreInstanceFieldNode* ast_node,
                          Value* instance,
                          Value* value)
       : ast_node_(*ast_node), instance_(instance), value_(value) {
     ASSERT(instance_ != NULL);
     ASSERT(value_ != NULL);
   }
 
   DECLARE_COMPUTATION(StoreInstanceField)
 
-  intptr_t node_id() const { return ast_node_.id(); }
   intptr_t token_index() const { return ast_node_.token_index(); }
   const Field& field() const { return ast_node_.field(); }
 
   Value* instance() const { return instance_; }
   Value* value() const { return value_; }
 
  private:
   const StoreInstanceFieldNode& ast_node_;
   Value* instance_;
   Value* value_;
@@ skipping 36 matching lines @@
   Value* const value_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreStaticFieldComp);
 };
 
 
 // Not simply an InstanceCall because it has somewhat more complicated
 // semantics: the value operand is preserved before the call.
 class StoreIndexedComp : public Computation {
  public:
-  StoreIndexedComp(intptr_t node_id,
-                   intptr_t token_index,
+  StoreIndexedComp(intptr_t token_index,
                    intptr_t try_index,
                    Value* array,
                    Value* index,
                    Value* value)
-      : node_id_(node_id),
-        token_index_(token_index),
+      : token_index_(token_index),
         try_index_(try_index),
         array_(array),
         index_(index),
         value_(value) { }
 
   DECLARE_COMPUTATION(StoreIndexed)
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   Value* array() const { return array_; }
   Value* index() const { return index_; }
   Value* value() const { return value_; }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* array_;
   Value* index_;
   Value* value_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreIndexedComp);
 };
 
 
 // Not simply an InstanceCall because it has somewhat more complicated
 // semantics: the value operand is preserved before the call.
 class InstanceSetterComp : public Computation {
  public:
-  InstanceSetterComp(intptr_t node_id,
-                     intptr_t token_index,
+  InstanceSetterComp(intptr_t token_index,
                      intptr_t try_index,
                      const String& field_name,
                      Value* receiver,
                      Value* value)
-      : node_id_(node_id),
-        token_index_(token_index),
+      : token_index_(token_index),
         try_index_(try_index),
         field_name_(field_name),
         receiver_(receiver),
         value_(value) { }
 
   DECLARE_COMPUTATION(InstanceSetter)
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   const String& field_name() const { return field_name_; }
   Value* receiver() const { return receiver_; }
   Value* value() const { return value_; }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   const String& field_name_;
   Value* const receiver_;
   Value* const value_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceSetterComp);
 };
 
 
@@ skipping 38 matching lines @@
 
  private:
   Value* value_;
 
   DISALLOW_COPY_AND_ASSIGN(BooleanNegateComp);
 };
 
 
 class InstanceOfComp : public Computation {
  public:
-  InstanceOfComp(intptr_t node_id,
-                 intptr_t token_index,
+  InstanceOfComp(intptr_t token_index,
                  intptr_t try_index,
                  Value* value,
                  Value* type_arguments,  // Can be NULL.
                  const AbstractType& type,
                  bool negate_result)
-      : node_id_(node_id),
-        token_index_(token_index),
+      : token_index_(token_index),
         try_index_(try_index),
         value_(value),
         type_arguments_(type_arguments),
         type_(type),
         negate_result_(negate_result) {
     ASSERT(value_ != NULL);
     ASSERT(!type.IsNull());
   }
 
   DECLARE_COMPUTATION(InstanceOf)
 
   Value* value() const { return value_; }
   Value* type_arguments() const { return type_arguments_; }
   bool negate_result() const { return negate_result_; }
   const AbstractType& type() const { return type_; }
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* value_;
   Value* type_arguments_;
   const AbstractType& type_;
   const bool negate_result_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceOfComp);
 };
 
@@ skipping 112 matching lines @@
     ASSERT(instantiator_ != NULL);
   }
 
   DECLARE_COMPUTATION(ExtractFactoryTypeArguments)
 
   Value* instantiator() const { return instantiator_; }
   const AbstractTypeArguments& type_arguments() const {
     return ast_node_.type_arguments();
   }
   const Function& factory() const { return ast_node_.constructor(); }
-  intptr_t node_id() const { return ast_node_.id(); }
   intptr_t token_index() const { return ast_node_.token_index(); }
   intptr_t try_index() const { return try_index_; }
 
  private:
   const ConstructorCallNode& ast_node_;
   const intptr_t try_index_;
   Value* instantiator_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtractFactoryTypeArgumentsComp);
 };
 
 
 class ExtractConstructorTypeArgumentsComp : public Computation {
  public:
   ExtractConstructorTypeArgumentsComp(ConstructorCallNode* ast_node,
                                       Value* instantiator)
       : ast_node_(*ast_node), instantiator_(instantiator) {
     ASSERT(instantiator_ != NULL);
   }
 
   DECLARE_COMPUTATION(ExtractConstructorTypeArguments)
 
   Value* instantiator() const { return instantiator_; }
   const AbstractTypeArguments& type_arguments() const {
     return ast_node_.type_arguments();
   }
   const Function& constructor() const { return ast_node_.constructor(); }
-  intptr_t node_id() const { return ast_node_.id(); }
   intptr_t token_index() const { return ast_node_.token_index(); }
 
  private:
   const ConstructorCallNode& ast_node_;
   Value* instantiator_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtractConstructorTypeArgumentsComp);
 };
 
 
 class ExtractConstructorInstantiatorComp : public Computation {
  public:
   ExtractConstructorInstantiatorComp(ConstructorCallNode* ast_node,
                                      Value* instantiator,
                                      Value* discard_value)
       : ast_node_(*ast_node),
         instantiator_(instantiator),
         discard_value_(discard_value) {
     ASSERT(instantiator_ != NULL);
   }
 
   DECLARE_COMPUTATION(ExtractConstructorInstantiator)
 
   Value* instantiator() const { return instantiator_; }
   Value* discard_value() const { return discard_value_; }
   const AbstractTypeArguments& type_arguments() const {
     return ast_node_.type_arguments();
   }
   const Function& constructor() const { return ast_node_.constructor(); }
-  intptr_t node_id() const { return ast_node_.id(); }
   intptr_t token_index() const { return ast_node_.token_index(); }
 
  private:
   const ConstructorCallNode& ast_node_;
   Value* instantiator_;
   Value* discard_value_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtractConstructorInstantiatorComp);
 };
 
@@ skipping 35 matching lines @@
 
  private:
   Value* context_value_;
 
   DISALLOW_COPY_AND_ASSIGN(ChainContextComp);
 };
 
 
 class CloneContextComp : public Computation {
  public:
-  CloneContextComp(intptr_t node_id,
-                   intptr_t token_index,
+  CloneContextComp(intptr_t token_index,
                    intptr_t try_index,
                    Value* context_value)
-      : node_id_(node_id),
-        token_index_(token_index),
+      : token_index_(token_index),
         try_index_(try_index),
         context_value_(context_value) {
     ASSERT(context_value_ != NULL);
   }
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   Value* context_value() const { return context_value_; }
 
   DECLARE_COMPUTATION(CloneContext)
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* context_value_;
 
   DISALLOW_COPY_AND_ASSIGN(CloneContextComp);
 };
 
 
 class CatchEntryComp : public Computation {
  public:
@@ skipping 53 matching lines @@
 
 // Functions required in all concrete instruction classes.
 #define DECLARE_INSTRUCTION(type)                                              \
   virtual Instruction* Accept(FlowGraphVisitor* visitor);                      \
   virtual bool Is##type() const { return true; }                               \
   virtual type##Instr* As##type() { return this; }                             \
 
 
 class Instruction : public ZoneAllocated {
  public:
-  Instruction() { }
+  Instruction() : cid_(Computation::GetNextCid()) { }
+
+  // Unique computation/instruction id, used for deoptimization, e.g. for
+  // ReturnInstr, ThrowInstr and ReThrowInstr.
+  intptr_t cid() const { return cid_; }
 
   virtual bool IsBlockEntry() const { return false; }
   BlockEntryInstr* AsBlockEntry() {
     return IsBlockEntry() ? reinterpret_cast<BlockEntryInstr*>(this) : NULL;
   }
 
   // Visiting support.
   virtual Instruction* Accept(FlowGraphVisitor* visitor) = 0;
 
   virtual Instruction* StraightLineSuccessor() const = 0;
@@ skipping 19 matching lines @@
     UNREACHABLE();
   }
 
 #define INSTRUCTION_TYPE_CHECK(type)                                           \
   virtual bool Is##type() const { return false; }                              \
   virtual type##Instr* As##type() { return NULL; }
 FOR_EACH_INSTRUCTION(INSTRUCTION_TYPE_CHECK)
 #undef INSTRUCTION_TYPE_CHECK
 
  private:
+  const intptr_t cid_;
   DISALLOW_COPY_AND_ASSIGN(Instruction);
 };
 
 
 // Basic block entries are administrative nodes.  Joins are the only nodes
 // with multiple predecessors.  Targets are the other basic block entries.
 // The types enforce edge-split form---joins are forbidden as the successors
 // of branches.
 class BlockEntryInstr : public Instruction {
  public:
@@ skipping 250 matching lines @@
   const intptr_t destination_;
   const intptr_t source_;
   Instruction* successor_;
 
   DISALLOW_COPY_AND_ASSIGN(TuckTempInstr);
 };
 
 
 class ReturnInstr : public Instruction {
  public:
-  ReturnInstr(intptr_t node_id, intptr_t token_index, Value* value)
-      : node_id_(node_id), token_index_(token_index), value_(value) {
+  ReturnInstr(intptr_t token_index, Value* value)
+      : token_index_(token_index), value_(value) {
     ASSERT(value_ != NULL);
   }
 
   DECLARE_INSTRUCTION(Return)
 
   Value* value() const { return value_; }
   intptr_t token_index() const { return token_index_; }
-  intptr_t node_id() const { return node_id_; }
 
   virtual Instruction* StraightLineSuccessor() const { return NULL; }
   virtual void SetSuccessor(Instruction* instr) { UNREACHABLE(); }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   Value* value_;
 
   DISALLOW_COPY_AND_ASSIGN(ReturnInstr);
 };
 
 
 class ThrowInstr : public Instruction {
  public:
-  ThrowInstr(intptr_t node_id,
-             intptr_t token_index,
+  ThrowInstr(intptr_t token_index,
              intptr_t try_index,
              Value* exception)
-      : node_id_(node_id),
-        token_index_(token_index),
+      : token_index_(token_index),
         try_index_(try_index),
         exception_(exception),
         successor_(NULL) {
     ASSERT(exception_ != NULL);
   }
 
   DECLARE_INSTRUCTION(Throw)
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   Value* exception() const { return exception_; }
 
   // Parser can generate a throw within an expression tree.
   virtual Instruction* StraightLineSuccessor() const {
     return successor_;
   }
   virtual void SetSuccessor(Instruction* instr) {
     ASSERT(successor_ == NULL);
     successor_ = instr;
   }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* exception_;
   Instruction* successor_;
 
   DISALLOW_COPY_AND_ASSIGN(ThrowInstr);
 };
 
 
 class ReThrowInstr : public Instruction {
  public:
-  ReThrowInstr(intptr_t node_id,
-              intptr_t token_index,
-              intptr_t try_index,
-              Value* exception,
-              Value* stack_trace)
-      : node_id_(node_id),
-        token_index_(token_index),
+  ReThrowInstr(intptr_t token_index,
+               intptr_t try_index,
+               Value* exception,
+               Value* stack_trace)
+      : token_index_(token_index),
         try_index_(try_index),
         exception_(exception),
         stack_trace_(stack_trace),
         successor_(NULL) {
     ASSERT(exception_ != NULL);
     ASSERT(stack_trace_ != NULL);
   }
 
   DECLARE_INSTRUCTION(ReThrow)
 
-  intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   Value* exception() const { return exception_; }
   Value* stack_trace() const { return stack_trace_; }
 
   // Parser can generate a rethrow within an expression tree.
   virtual Instruction* StraightLineSuccessor() const {
     return successor_;
   }
   virtual void SetSuccessor(Instruction* instr) {
     ASSERT(successor_ == NULL);
     successor_ = instr;
   }
 
  private:
-  const intptr_t node_id_;
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* exception_;
   Value* stack_trace_;
   Instruction* successor_;
 
   DISALLOW_COPY_AND_ASSIGN(ReThrowInstr);
 };
 
 
@@ skipping 70 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_