From 2980ce98be117a756ec5ad485273fd5400049683 Mon Sep 17 00:00:00 2001
From: Hubert Tong <hubert.reinterpretcast@gmail.com>
Date: Sun, 18 Oct 2020 11:41:52 -0400
Subject: [PATCH] Fix various format specifier mismatches

Format specifiers of incorrect length are replaced with format specifier
macros from `<cinttypes>` matching the typedefs used to declare the type
of the value being printed.

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D89637
---
 llvm/lib/Object/COFFObjectFile.cpp    | 4 ++--
 llvm/lib/ProfileData/GCOV.cpp         | 6 +++---
 llvm/tools/llvm-readobj/ELFDumper.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp
index cd10e67..c090259 100644
--- a/llvm/lib/Object/COFFObjectFile.cpp
+++ b/llvm/lib/Object/COFFObjectFile.cpp
@@ -28,8 +28,8 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include <algorithm>
 #include <cassert>
+#include <cinttypes>
 #include <cstddef>
-#include <cstdint>
 #include <cstring>
 #include <limits>
 #include <memory>
@@ -666,7 +666,7 @@ Error COFFObjectFile::initTLSDirectoryPtr() {
   if (DataEntry->Size != DirSize)
     return createStringError(
         object_error::parse_failed,
-        "TLS Directory size (%u) is not the expected size (%u).",
+        "TLS Directory size (%u) is not the expected size (%" PRIu64 ").",
         static_cast<uint32_t>(DataEntry->Size), DirSize);
 
   uintptr_t IntPtr = 0;
diff --git a/llvm/lib/ProfileData/GCOV.cpp b/llvm/lib/ProfileData/GCOV.cpp
index 1d8aec0..c073525 100644
--- a/llvm/lib/ProfileData/GCOV.cpp
+++ b/llvm/lib/ProfileData/GCOV.cpp
@@ -939,16 +939,16 @@ void Context::printBranchInfo(const GCOVBlock &Block, uint32_t &edgeIdx,
 }
 
 void Context::printSummary(const Summary &summary, raw_ostream &os) const {
-  os << format("Lines executed:%.2f%% of %u\n",
+  os << format("Lines executed:%.2f%% of %" PRIu64 "\n",
                double(summary.linesExec) * 100 / summary.lines, summary.lines);
   if (options.BranchInfo) {
     if (summary.branches == 0) {
       os << "No branches\n";
     } else {
-      os << format("Branches executed:%.2f%% of %u\n",
+      os << format("Branches executed:%.2f%% of %" PRIu64 "\n",
                    double(summary.branchesExec) * 100 / summary.branches,
                    summary.branches);
-      os << format("Taken at least once:%.2f%% of %u\n",
+      os << format("Taken at least once:%.2f%% of %" PRIu64 "\n",
                    double(summary.branchesTaken) * 100 / summary.branches,
                    summary.branches);
     }
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 8594d717..af94f14 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -5560,7 +5560,7 @@ template <class ELFT> void GNUStyle<ELFT>::printDependentLibs() {
        << format_hex(Current.Offset, 1) << " contains " << SecEntries.size()
        << " entries:\n";
     for (NameOffset Entry : SecEntries)
-      OS << "  [" << format("%6tx", Entry.Offset) << "]  " << Entry.Name
+      OS << "  [" << format("%6" PRIx64, Entry.Offset) << "]  " << Entry.Name
          << "\n";
     OS << "\n";
     SecEntries.clear();
-- 
2.7.4