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

runtime/vm/code_descriptors.cc

 // 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.
 
 #include "vm/code_descriptors.h"
 
 #include "vm/log.h"
 
 namespace dart {
 
@@ skipping 222 matching lines @@
     const GrowableArray<const Function*>& inline_id_to_function)
     : buffered_pc_offset_(0),
       buffered_inline_id_stack_(),
       buffered_token_pos_stack_(),
       written_pc_offset_(0),
       written_inline_id_stack_(),
       written_token_pos_stack_(),
       caller_inline_id_(caller_inline_id),
       inline_id_to_token_pos_(inline_id_to_token_pos),
       inline_id_to_function_(inline_id_to_function),
+      inlined_functions_(
+          GrowableObjectArray::Handle(GrowableObjectArray::New(Heap::kOld))),
       buffer_(NULL),
       stream_(&buffer_, zone_allocator, 64),
       stack_traces_only_(stack_traces_only) {
   buffered_inline_id_stack_.Add(0);
   buffered_token_pos_stack_.Add(kInitialPosition);
   written_inline_id_stack_.Add(0);
   written_token_pos_stack_.Add(kInitialPosition);
 }
 
 
@@ skipping 128 matching lines @@
       RawPcDescriptors::kIcCall | RawPcDescriptors::kUnoptStaticCall |
       RawPcDescriptors::kRuntimeCall | RawPcDescriptors::kOther;
   if (stack_traces_only_ && ((kind & kCanThrow) != 0)) {
     BufferChangePosition(pos);
     BufferAdvancePC(pc_offset - buffered_pc_offset_);
     FlushBuffer();
   }
 }
 
 
+intptr_t CodeSourceMapBuilder::GetFunctionId(intptr_t inline_id) {
+  const Function& function = *inline_id_to_function_[inline_id];
+  for (intptr_t i = 0; i < inlined_functions_.Length(); i++) {
+    if (inlined_functions_.At(i) == function.raw()) {
+      return i;
+    }
+  }
+  inlined_functions_.Add(function, Heap::kOld);
+  return inlined_functions_.Length() - 1;
+}
+
+
 RawArray* CodeSourceMapBuilder::InliningIdToFunction() {
-  if (inline_id_to_function_.length() <= 1) {
-    // Not optimizing, or optimizing and nothing inlined.
+  if (inlined_functions_.Length() == 0) {
     return Object::empty_array().raw();
   }
-  const Array& res =
-      Array::Handle(Array::New(inline_id_to_function_.length(), Heap::kOld));
-  for (intptr_t i = 0; i < inline_id_to_function_.length(); i++) {
-    res.SetAt(i, *inline_id_to_function_[i]);
-  }
-  return res.raw();
+  return Array::MakeArray(inlined_functions_);
 }
 
 
 RawCodeSourceMap* CodeSourceMapBuilder::Finalize() {
   if (!stack_traces_only_) {
     FlushBuffer();
   }
   intptr_t length = stream_.bytes_written();
   const CodeSourceMap& map = CodeSourceMap::Handle(CodeSourceMap::New(length));
   NoSafepointScope no_safepoint;
@@ skipping 228 matching lines @@
         break;
       }
       default:
         UNREACHABLE();
     }
   }
   THR_Print("}\n");
 }
 
 }  // namespace dart