Reapply "Use platform-independent format specifiers when disassembling code objects."

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 6609 matching lines @@
   }
   UNREACHABLE();
   return "";
 }
 
 
 const char* PcDescriptors::ToCString() const {
   if (Length() == 0) {
     return "No pc descriptors\n";
   }
-  const char* kFormat = "0x%x\t%s\t%ld\t%ld\t%ld\n";
+  const char* kFormat =
+      "0x%" PRIxPTR "\t%s\t%" PRIdPTR "\t%" PRIdPTR "\t%" PRIdPTR "\n";
   // First compute the buffer size required.
-  intptr_t len = 0;
+  intptr_t len = 1;  // Trailing '\0'.
   for (intptr_t i = 0; i < Length(); i++) {
     const intptr_t multi_purpose_index = DescriptorKind(i) == kDeoptIndex ?
         DeoptIndex(i) : TryIndex(i);
     len += OS::SNPrint(NULL, 0, kFormat,
         PC(i), KindAsStr(i), NodeId(i), TokenIndex(i), multi_purpose_index);
   }
   // Allocate the buffer.
   char* buffer = reinterpret_cast<char*>(
-      Isolate::Current()->current_zone()->Allocate(len + 1));
+      Isolate::Current()->current_zone()->Allocate(len));
   // Layout the fields in the buffer.
   intptr_t index = 0;
   for (intptr_t i = 0; i < Length(); i++) {
     const intptr_t multi_purpose_index = DescriptorKind(i) == kDeoptIndex ?
         DeoptIndex(i) : TryIndex(i);
     index += OS::SNPrint((buffer + index), (len - index), kFormat,
         PC(i), KindAsStr(i), NodeId(i), TokenIndex(i), multi_purpose_index);
   }
   return buffer;
 }
@@ skipping 241 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* ExceptionHandlers::ToCString() const {
   if (Length() == 0) {
     return "No exception handlers\n";
   }
   // First compute the buffer size required.
-  intptr_t len = 0;
+  const char* kFormat = "%" PRIdPTR " => 0x%" PRIxPTR "\n";
+  intptr_t len = 1;  // Trailing '\0'.
   for (intptr_t i = 0; i < Length(); i++) {
-    len += OS::SNPrint(NULL, 0, "%ld => 0x%x\n",
-                       TryIndex(i), HandlerPC(i));
+    len += OS::SNPrint(NULL, 0, kFormat, TryIndex(i), HandlerPC(i));
   }
   // Allocate the buffer.
   char* buffer = reinterpret_cast<char*>(
-      Isolate::Current()->current_zone()->Allocate(len + 1));
+      Isolate::Current()->current_zone()->Allocate(len));
   // Layout the fields in the buffer.
   intptr_t index = 0;
   for (intptr_t i = 0; i < Length(); i++) {
     index += OS::SNPrint((buffer + index),
                          (len - index),
-                         "%ld => 0x%x\n",
+                         kFormat,
                          TryIndex(i),
                          HandlerPC(i));
   }
   return buffer;
 }
 
 
 intptr_t DeoptInfo::Length() const {
   return Smi::Value(raw_ptr()->length_);
 }
@@ skipping 4149 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart