Redesign inlining interval computation.

runtime/vm/object.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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 4025 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(Comments);
   };
 
 
   const Comments& comments() const;
   void set_comments(const Comments& comments) const;
 
   enum InlinedIntervalEntries {
     kInlIntStart = 0,
-    kInlIntEnd = 1,
-    kInlIntFunction = 2,
-    kInlIntNumEntries = 3
+    kInlIntInliningId = 1,
+    kInlIntCallerId = 2,
+    kInlIntNumEntries = 3,
   };
 
   RawArray* inlined_intervals() const {
     return raw_ptr()->inlined_intervals_;
   }
   void set_inlined_intervals(const Array& value) const;
 
+  RawArray* inlined_id_to_function() const {
+    return raw_ptr()->inlined_id_to_function_;
+  }
+  void set_inlined_id_to_function(const Array& value) const;
+
   void GetInlinedFunctionsAt(
       intptr_t offset, GrowableArray<Function*>* fs) const;
 
   void DumpInlinedIntervals() const;
 
   RawLocalVarDescriptors* var_descriptors() const {
     return raw_ptr()->var_descriptors_;
   }
   void set_var_descriptors(const LocalVarDescriptors& value) const {
     ASSERT(value.IsOld());
@@ skipping 160 matching lines @@
     ASSERT(index >= 0);
     ASSERT(index < pointer_offsets_length());
     // TODO(iposva): Unit test is missing for this functionality.
     return &UnsafeMutableNonPointer(raw_ptr()->data())[index];
   }
   void SetPointerOffsetAt(int index, int32_t offset_in_instructions) {
     NoGCScope no_gc;
     *PointerOffsetAddrAt(index) = offset_in_instructions;
   }
 
+  // Currently slow, as it searches linearly through inlined_intervals().
+  intptr_t GetCallerId(intptr_t inlined_id) const;
+
   intptr_t BinarySearchInSCallTable(uword pc) const;
   static RawCode* LookupCodeInIsolate(Isolate* isolate, uword pc);
 
   // New is a private method as RawInstruction and RawCode objects should
   // only be created using the Code::FinalizeCode method. This method creates
   // the RawInstruction and RawCode objects, sets up the pointer offsets
   // and links the two in a GC safe manner.
   static RawCode* New(intptr_t pointer_offsets_length);
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(Code, Object);
@@ skipping 3546 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_