Add inlining ranges/intervals to code objects so that we can map a pc to the inlined stack. The map…

runtime/vm/intermediate_language.h

 // Copyright (c) 2013, 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 593 matching lines @@
   };
 #undef DECLARE_TAG
 
   explicit Instruction(intptr_t deopt_id = Isolate::kNoDeoptId)
       : deopt_id_(deopt_id),
         lifetime_position_(-1),
         previous_(NULL),
         next_(NULL),
         env_(NULL),
         locs_(NULL),
+        inlining_id_(-1),
         place_id_(kNoPlaceId) { }
 
   virtual ~Instruction() { }
 
   virtual Tag tag() const = 0;
 
   intptr_t deopt_id() const {
     ASSERT(CanDeoptimize() || CanBecomeDeoptimizationTarget());
     return GetDeoptId();
   }
@@ skipping 184 matching lines @@
   }
 
   // Get the block entry for this instruction.
   virtual BlockEntryInstr* GetBlock() const;
 
   // Place identifiers used by the load optimization pass.
   intptr_t place_id() const { return place_id_; }
   void set_place_id(intptr_t place_id) { place_id_ = place_id; }
   bool HasPlaceId() const { return place_id_ != kNoPlaceId; }
 
+  intptr_t inlining_id() const { return inlining_id_; }
+  void set_inlining_id(intptr_t value) {
+    ASSERT(value >= 0);
+    inlining_id_ = value;
+  }
+  bool has_inlining_id() const { return inlining_id_ >= 0; }
+
   // Returns a hash code for use with hash maps.
   virtual intptr_t Hashcode() const;
 
   // Compares two instructions.  Returns true, iff:
   // 1. They have the same tag.
   // 2. All input operands are Equals.
   // 3. They satisfy AttributesEqual.
   bool Equals(Instruction* other) const;
 
   // Compare attributes of a instructions (except input operands and tag).
@@ skipping 47 matching lines @@
   enum {
     kNoPlaceId = -1
   };
 
   intptr_t deopt_id_;
   intptr_t lifetime_position_;  // Position used by register allocator.
   Instruction* previous_;
   Instruction* next_;
   Environment* env_;
   LocationSummary* locs_;
+  intptr_t inlining_id_;
   intptr_t place_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Instruction);
 };
 
 
 class PureInstruction : public Instruction {
  public:
   explicit PureInstruction(intptr_t deopt_id)
       : Instruction(deopt_id) { }
@@ skipping 7111 matching lines @@
       Isolate* isolate, bool opt) const {                                     \
     UNIMPLEMENTED();                                                          \
     return NULL;                                                              \
   }                                                                           \
   void Name::EmitNativeCode(FlowGraphCompiler* compiler) { UNIMPLEMENTED(); }
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_