Redesign inlining interval computation.

runtime/vm/flow_graph_compiler.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_COMPILER_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
@@ skipping 252 matching lines @@
 
     bool is_marked_;
   };
 
  public:
   FlowGraphCompiler(
       Assembler* assembler,
       FlowGraph* flow_graph,
       const ParsedFunction& parsed_function,
       bool is_optimizing,
-      const GrowableArray<const Function*>& inline_id_to_function);
+      const GrowableArray<const Function*>& inline_id_to_function,
+      const GrowableArray<intptr_t>& caller_inline_id);
 
   ~FlowGraphCompiler();
 
   static bool SupportsUnboxedDoubles();
   static bool SupportsUnboxedMints();
   static bool SupportsSinCos();
   static bool SupportsUnboxedSimd128();
 
   // Accessors.
   Assembler* assembler() const { return assembler_; }
@@ skipping 237 matching lines @@
 
   Isolate* isolate() const { return isolate_; }
 
   void AddStubCallTarget(const Code& code);
 
   const Array& inlined_code_intervals() const {
     ASSERT(inlined_code_intervals_ != NULL);
     return *inlined_code_intervals_;
   }
 
+  RawArray* InliningIdToFunction() const;
+
  private:
   friend class CheckStackOverflowSlowPath;  // For pending_deoptimization_env_.
 
   void EmitFrameEntry();
 
   void AddStaticCallTarget(const Function& function);
 
   void GenerateDeferredCode();
 
   void EmitInstructionPrologue(Instruction* instr);
@@ skipping 137 matching lines @@
   Environment* pending_deoptimization_env_;
 
   intptr_t entry_patch_pc_offset_;
   intptr_t patch_code_pc_offset_;
   intptr_t lazy_deopt_pc_offset_;
 
   ZoneGrowableArray<const ICData*>* deopt_id_to_ic_data_;
 
   const Array* inlined_code_intervals_;
   const GrowableArray<const Function*>& inline_id_to_function_;
+  const GrowableArray<intptr_t>& caller_inline_id_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_