[compiler-rt] 54ed8b9 - tsan/dd: fix format strings

[Dmitry Vyukov via llvm-commits]

Author: Dmitry Vyukov
Date: 2021-08-13T17:45:29+02:00
New Revision: 54ed8b93176e35c072394d615e4099e8ee0f7e9e

URL: https://github.com/llvm/llvm-project/commit/54ed8b93176e35c072394d615e4099e8ee0f7e9e
DIFF: https://github.com/llvm/llvm-project/commit/54ed8b93176e35c072394d615e4099e8ee0f7e9e.diff

LOG: tsan/dd: fix format strings

Reviewed By: melver

Differential Revision: https://reviews.llvm.org/D108040

Added: 
    

Modified: 
    compiler-rt/lib/tsan/dd/dd_interceptors.cpp
    compiler-rt/lib/tsan/dd/dd_rtl.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/tsan/dd/dd_interceptors.cpp b/compiler-rt/lib/tsan/dd/dd_interceptors.cpp
index f78ef2d442797..2c36f691ec5b4 100644
--- a/compiler-rt/lib/tsan/dd/dd_interceptors.cpp
+++ b/compiler-rt/lib/tsan/dd/dd_interceptors.cpp
@@ -285,7 +285,8 @@ static void InitDataSeg() {
     if (is_bss) g_data_end = segment.end;
     prev_is_data = is_data;
   }
-  VPrintf(1, "guessed data_start=%p data_end=%p\n",  g_data_start, g_data_end);
+  VPrintf(1, "guessed data_start=0x%zx data_end=0x%zx\n", g_data_start,
+          g_data_end);
   CHECK_LT(g_data_start, g_data_end);
   CHECK_GE((uptr)&g_data_start, g_data_start);
   CHECK_LT((uptr)&g_data_start, g_data_end);

diff  --git a/compiler-rt/lib/tsan/dd/dd_rtl.cpp b/compiler-rt/lib/tsan/dd/dd_rtl.cpp
index f655e02a644e1..35b367c0cecb0 100644
--- a/compiler-rt/lib/tsan/dd/dd_rtl.cpp
+++ b/compiler-rt/lib/tsan/dd/dd_rtl.cpp
@@ -42,8 +42,8 @@ static void ReportDeadlock(Thread *thr, DDReport *rep) {
   Printf("==============================\n");
   Printf("WARNING: lock-order-inversion (potential deadlock)\n");
   for (int i = 0; i < rep->n; i++) {
-    Printf("Thread %d locks mutex %llu while holding mutex %llu:\n",
-      rep->loop[i].thr_ctx, rep->loop[i].mtx_ctx1, rep->loop[i].mtx_ctx0);
+    Printf("Thread %lld locks mutex %llu while holding mutex %llu:\n",
+           rep->loop[i].thr_ctx, rep->loop[i].mtx_ctx1, rep->loop[i].mtx_ctx0);
     PrintStackTrace(thr, rep->loop[i].stk[1]);
     if (rep->loop[i].stk[0]) {
       Printf("Mutex %llu was acquired here:\n",