Encode inlining information in CodeSourceMap and remove inlining interval arrays.

runtime/vm/flow_graph_compiler.h

Index: runtime/vm/flow_graph_compiler.h
diff --git a/runtime/vm/flow_graph_compiler.h b/runtime/vm/flow_graph_compiler.h
index 9e5b784dfb6f05a385d9050f352c3d0113b13d82..3d8196a8d53ba829218cc57b3b5ead54ae849a42 100644
--- a/runtime/vm/flow_graph_compiler.h
+++ b/runtime/vm/flow_graph_compiler.h
@@ -23,7 +23,6 @@ template <typename T>
 class GrowableArray;
 class ParsedFunction;
 
-
 class ParallelMoveResolver : public ValueObject {
  public:
   explicit ParallelMoveResolver(FlowGraphCompiler* compiler);
@@ -526,6 +525,7 @@ class FlowGraphCompiler : public ValueObject {
   void FinalizeStackMaps(const Code& code);
   void FinalizeVarDescriptors(const Code& code);
   void FinalizeStaticCallTargetsTable(const Code& code);
+  void FinalizeCodeSourceMap(const Code& code);
 
   const Class& double_class() const { return double_class_; }
   const Class& mint_class() const { return mint_class_; }
@@ -578,26 +578,12 @@ class FlowGraphCompiler : public ValueObject {
 
   void AddStubCallTarget(const Code& code);
 
-  const Array& inlined_code_intervals() const {
-    return inlined_code_intervals_;
-  }
-
   RawArray* edge_counters_array() const { return edge_counters_array_.raw(); }
 
   RawArray* InliningIdToFunction() const;
-  RawArray* InliningIdToTokenPos() const;
-  RawArray* CallerInliningIdMap() const;
-
-  CodeSourceMapBuilder* code_source_map_builder() {
-    if (code_source_map_builder_ == NULL) {
-      code_source_map_builder_ = new CodeSourceMapBuilder();
-    }
-    ASSERT(code_source_map_builder_ != NULL);
-    return code_source_map_builder_;
-  }
 
   void BeginCodeSourceRange();
-  bool EndCodeSourceRange(TokenPosition token_pos);
+  void EndCodeSourceRange(TokenPosition token_pos);
 
 #if defined(TARGET_ARCH_DBC)
   enum CallResult {
@@ -776,7 +762,6 @@ class FlowGraphCompiler : public ValueObject {
   DescriptorList* pc_descriptors_list_;
   StackMapTableBuilder* stackmap_table_builder_;
   CodeSourceMapBuilder* code_source_map_builder_;
-  intptr_t saved_code_size_;
   GrowableArray<BlockInfo*> block_info_;
   GrowableArray<CompilerDeoptInfo*> deopt_infos_;
   GrowableArray<SlowPathCode*> slow_path_code_;
@@ -810,11 +795,6 @@ class FlowGraphCompiler : public ValueObject {
 
   Array& edge_counters_array_;
 
-  Array& inlined_code_intervals_;
-  const GrowableArray<const Function*>& inline_id_to_function_;
-  const GrowableArray<TokenPosition>& inline_id_to_token_pos_;
-  const GrowableArray<intptr_t>& caller_inline_id_;
-
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };