When generating CodeSourceMaps, reassign function ids once per function instead of once per inlinin…

runtime/vm/code_descriptors.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 RUNTIME_VM_CODE_DESCRIPTORS_H_
 #define RUNTIME_VM_CODE_DESCRIPTORS_H_
 
 #include "vm/ast.h"
 #include "vm/code_generator.h"
 #include "vm/datastream.h"
@@ skipping 223 matching lines @@
   void BeginCodeSourceRange(int32_t pc_offset);
   void EndCodeSourceRange(int32_t pc_offset, TokenPosition pos);
   void NoteDescriptor(RawPcDescriptors::Kind kind,
                       int32_t pc_offset,
                       TokenPosition pos);
 
   RawArray* InliningIdToFunction();
   RawCodeSourceMap* Finalize();
 
  private:
+  intptr_t GetFunctionId(intptr_t inline_id);
+
   void BufferChangePosition(TokenPosition pos) {
     buffered_token_pos_stack_.Last() = pos;
   }
   void WriteChangePosition(TokenPosition pos);
   void BufferAdvancePC(int32_t distance) { buffered_pc_offset_ += distance; }
   void WriteAdvancePC(int32_t distance) {
     stream_.Write<uint8_t>(kAdvancePC);
     stream_.Write<int32_t>(distance);
     written_pc_offset_ += distance;
   }
   void BufferPush(intptr_t inline_id) {
     buffered_inline_id_stack_.Add(inline_id);
     buffered_token_pos_stack_.Add(kInitialPosition);
   }
   void WritePush(intptr_t inline_id) {
     stream_.Write<uint8_t>(kPushFunction);
-    stream_.Write<int32_t>(inline_id);
+    stream_.Write<int32_t>(GetFunctionId(inline_id));
     written_inline_id_stack_.Add(inline_id);
     written_token_pos_stack_.Add(kInitialPosition);
   }
   void BufferPop() {
     buffered_inline_id_stack_.RemoveLast();
     buffered_token_pos_stack_.RemoveLast();
   }
   void WritePop() {
     stream_.Write<uint8_t>(kPopFunction);
     written_inline_id_stack_.RemoveLast();
@@ skipping 17 matching lines @@
   GrowableArray<TokenPosition> buffered_token_pos_stack_;
 
   intptr_t written_pc_offset_;
   GrowableArray<intptr_t> written_inline_id_stack_;
   GrowableArray<TokenPosition> written_token_pos_stack_;
 
   const GrowableArray<intptr_t>& caller_inline_id_;
   const GrowableArray<TokenPosition>& inline_id_to_token_pos_;
   const GrowableArray<const Function*>& inline_id_to_function_;
 
+  const GrowableObjectArray& inlined_functions_;
+
   uint8_t* buffer_;
   WriteStream stream_;
 
   const bool stack_traces_only_;
 
   DISALLOW_COPY_AND_ASSIGN(CodeSourceMapBuilder);
 };
 
 
 class CodeSourceMapReader : public ValueObject {
@@ skipping 14 matching lines @@
   const CodeSourceMap& map_;
   const Array& functions_;
   const Function& root_;
 
   DISALLOW_COPY_AND_ASSIGN(CodeSourceMapReader);
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_CODE_DESCRIPTORS_H_