Redesign inlining interval computation.

runtime/vm/disassembler.cc

 // Copyright (c) 2011, 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/disassembler.h"
 
 #include "vm/assembler.h"
 #include "vm/globals.h"
 #include "vm/os.h"
 #include "vm/json_stream.h"
@@ skipping 113 matching lines @@
     while (comment_finger < comments.Length() &&
            comments.PCOffsetAt(comment_finger) <= offset) {
       formatter->Print(
           "        ;; %s\n",
           String::Handle(comments.CommentAt(comment_finger)).ToCString());
       comment_finger++;
     }
     if (old_comment_finger != comment_finger) {
       // Comment emitted, emit inlining information.
       code.GetInlinedFunctionsAt(offset, &inlined_functions);
-      // Skip top scope function printing.
-      for (intptr_t i = 1; i < inlined_functions.length(); i++) {
-        if (i == 1) {
-          formatter->Print("        ;; Inlined ");
+      // Skip top scope function printing (last entry in 'inlined_functions').
+      bool first = true;
+      for (intptr_t i = inlined_functions.length() - 2; i >= 0; i--) {
+        const char* name = inlined_functions[i]->ToQualifiedCString();
+        if (first) {
+          formatter->Print("        ;; Inlined [%s", name);
+          first = false;
+        } else {
+          formatter->Print(" -> %s", name);
         }
-        formatter->Print("-> %s ", inlined_functions[i]->ToQualifiedCString());
       }
-      if (inlined_functions.length() > 1) {
-        formatter->Print("\n");
+      if (!first) {
+        formatter->Print("]\n");
       }
     }
     int instruction_length;
     DecodeInstruction(hex_buffer,
                       sizeof(hex_buffer),
                       human_buffer,
                       sizeof(human_buffer),
                       &instruction_length, pc);
     formatter->ConsumeInstruction(hex_buffer,
                                   sizeof(hex_buffer),
                                   human_buffer,
                                   sizeof(human_buffer),
                                   pc);
     pc += instruction_length;
   }
 }
 
 }  // namespace dart