Encode inlining information in CodeSourceMap and remove inlining interval arrays.

runtime/vm/profiler_test.cc

 // Copyright (c) 2013, 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 "platform/assert.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/globals.h"
 #include "vm/profiler.h"
@@ skipping 2431 matching lines @@
     // See OffsetForPC in profiler_service.cc for more context.
     const intptr_t return_address_offset = i > 0 ? 1 : 0;
     sample->SetAt(i, pc_offsets[i] + return_address_offset);
     i++;
   }
   sample->SetAt(i, 0);
 }
 
 
 static uword FindPCForTokenPosition(const Code& code,
-                                    const CodeSourceMap& code_source_map,
                                     TokenPosition tp) {
-  CodeSourceMap::Iterator it(code_source_map);
-
-  while (it.MoveNext()) {
-    if (it.TokenPos() == tp) {
-      return it.PcOffset() + code.PayloadStart();
+  GrowableArray<const Function*> functions;
+  GrowableArray<TokenPosition> token_positions;
+  for (intptr_t pc_offset = 0; pc_offset < code.Size(); pc_offset++) {
+    code.GetInlinedFunctionsAt(pc_offset, &functions, &token_positions);
+    if (token_positions[0] == tp) {
+      return code.PayloadStart() + pc_offset;
     }
   }
 
   return 0;
 }
 
 
 TEST_CASE(Profiler_GetSourceReport) {
   const char* kScript =
       "doWork(i) => i * i;\n"
@@ skipping 46 matching lines @@
 
   const Script& script = Script::Handle(main.script());
   EXPECT(!script.IsNull());
 
   const Code& main_code = Code::Handle(main.CurrentCode());
   EXPECT(!main_code.IsNull());
 
   const Code& do_work_code = Code::Handle(do_work.CurrentCode());
   EXPECT(!do_work_code.IsNull());
 
-  const CodeSourceMap& main_code_source_map =
-      CodeSourceMap::Handle(main_code.code_source_map());
-  EXPECT(!main_code_source_map.IsNull());
-
-  const CodeSourceMap& do_work_code_source_map =
-      CodeSourceMap::Handle(do_work_code.code_source_map());
-  EXPECT(!do_work_code_source_map.IsNull());
-
   // Dump code source map.
-  CodeSourceMap::Dump(do_work_code_source_map, do_work_code, main);
-  CodeSourceMap::Dump(main_code_source_map, main_code, main);
+  do_work_code.DumpSourcePositions();
+  main_code.DumpSourcePositions();
 
   // Look up some source token position's pc.
-  uword squarePositionPc = FindPCForTokenPosition(
-      do_work_code, do_work_code_source_map, squarePosition);
+  uword squarePositionPc = FindPCForTokenPosition(do_work_code, squarePosition);
   EXPECT(squarePositionPc != 0);
 
-  uword callPositionPc =
-      FindPCForTokenPosition(main_code, main_code_source_map, callPosition);
+  uword callPositionPc = FindPCForTokenPosition(main_code, callPosition);
   EXPECT(callPositionPc != 0);
 
   // Look up some classifying token position's pc.
-  uword controlFlowPc = FindPCForTokenPosition(
-      do_work_code, do_work_code_source_map, TokenPosition::kControlFlow);
+  uword controlFlowPc =
+      FindPCForTokenPosition(do_work_code, TokenPosition::kControlFlow);
   EXPECT(controlFlowPc != 0);
 
-  uword tempMovePc = FindPCForTokenPosition(main_code, main_code_source_map,
-                                            TokenPosition::kTempMove);
+  uword tempMovePc =
+      FindPCForTokenPosition(main_code, TokenPosition::kTempMove);
   EXPECT(tempMovePc != 0);
 
   // Insert fake samples.
 
   // Sample 1:
   // squarePositionPc exclusive.
   // callPositionPc inclusive.
   uword sample1[] = {squarePositionPc,  // doWork.
                      callPositionPc,    // main.
                      0};
@@ skipping 39 matching lines @@
   EXPECT_SUBSTRING("\"positions\":[\"TempMove\",39]", js.ToCString());
   // Verify exclusive ticks in main.
   EXPECT_SUBSTRING("\"exclusiveTicks\":[1,0]", js.ToCString());
   // Verify inclusive ticks in main.
   EXPECT_SUBSTRING("\"inclusiveTicks\":[1,2]", js.ToCString());
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart