Fix a couple of incorrect format strings

[ldrumm]

Summary

This patch fixes use of incorrect %zi to format a plain int, and switches from using "%llu" to format a uint64_t to using the exact width specifier PRIu64 from inttypes.h

[zturner]

How about re-writing these to use llvm::formatv() since the whole point of it is to eliminate this problem entirely and clayborg@ has agreed that it looks good going forward?

Individual call-site suggestions inlined.

source/Interpreter/Args.cpp

216–217 ↗

(On Diff #82256)

s.Format("{0}[{1}]=\"{2}\"\n", label_name, i++, entry.ref);

219 ↗

(On Diff #82256)

s.Format("{0}[{1}]=NULL\n", label_name, i);

source/Plugins/ExpressionParser/Clang/IRForTarget.cpp

517–519 ↗

(On Diff #82256)

log->Format("Encountered an Object-C constant string with unusual "
            "element size {0}", string_array->getElementByteSize());

[clayborg]

Please swift to using the new formatv stuff as this is the main reason Zach made those changes.

source/Plugins/ExpressionParser/Clang/IRForTarget.cpp

41 ↗

(On Diff #82256)

Not needed if you use formatv.

[ldrumm]

switched to the new llvm::Format API

lldb/trunk/source/Interpreter/Args.cpp

 
 void Args::Dump(Stream &s, const char *label_name) const {
   if (!label_name)
     return;
 
   int i = 0;
   for (auto &entry : m_entries) {
     s.Indent();
-    s.Printf("%s[%zi]=\"%*s\"\n", label_name, i++, int(entry.ref.size()),
-             entry.ref.data());
+    s.Format("{0}[{1}]=\"{2}\"\n", label_name, i++, entry.ref);
   }
-  s.Printf("%s[%zi]=NULL\n", label_name, i);
+  s.Format("{0}[{1}]=NULL\n", label_name, i);
   s.EOL();
 }
 
 bool Args::GetCommandString(std::string &command) const {
   command.clear();
 
   for (size_t i = 0; i < m_entries.size(); ++i) {
     if (i > 0)

lldb/trunk/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp

case 2:
    encoding_flags = 0x0100; /* 0x0100 is kCFStringEncodingUTF16 */
    break;
  case 4:
    encoding_flags = 0x0c000100; /* 0x0c000100 is kCFStringEncodingUTF32 */
    break;
  default:
    encoding_flags = 0x0600; /* fall back to 0x0600, kCFStringEncodingASCII */
    if (log) {
-     log->Printf("Encountered an Objective-C constant string with unusual "
-                 "element size %llu",
+     log->Format("Encountered an Objective-C constant string with unusual "
+                 "element size {0}",
                  string_array->getElementByteSize());
    }
  }
  Constant *encoding_arg = ConstantInt::get(i32_ty, encoding_flags, false);
  Constant *isExternal_arg =
      ConstantInt::get(i8_ty, 0x0, false); /* 0x0 is false */
 
  Value *argument_array[5];