Enable -Wformat-pedantic and fix fallout.

[marxin]

Summary

Follow up of https://reviews.llvm.org/D113099

[vitalybuka]

compiler-rt/lib/xray/xray_x86_64.cpp

154

looks like xray prefers reinterpret_cast, can you fix this?

[vitalybuka]

LGTM. Thank you!

[marxin]

compiler-rt/lib/xray/xray_x86_64.cpp

154

Sure.

[dvyukov]

Hi,

Does this warn about anything other than passing T* for %p? Is this warning ever useful? I would say printf accepts any type T* for %p. It prints them perfectly well.
TSan runtime with DPrintf enabled is not clean.
Adding casts for all these cases is lots of verbosity (we prefer C++ casts now I think). And I don't see any particular value we will get for all that additional verbosity...

[543/1320] Building CXX object projects/compiler-rt/lib/tsan/CMakeFiles/clang_rt.tsan-x86_64.dir/rtl/tsan_fd.cpp.o
compiler-rt/lib/tsan/rtl/tsan_fd.cpp:165:55: warning: format specifies type 'void *' but the argument has type '__tsan::FdSync *' [-Wformat-pedantic]
  DPrintf("#%d: FdAcquire(%d) -> %p\n", thr->tid, fd, s);
                                 ~~                   ^
compiler-rt/lib/tsan/rtl/tsan_fd.cpp:176:55: warning: format specifies type 'void *' but the argument has type '__tsan::FdSync *' [-Wformat-pedantic]
  DPrintf("#%d: FdRelease(%d) -> %p\n", thr->tid, fd, s);
                                 ~~                   ^
2 warnings generated.
[547/1320] Linking CXX shared library lib/clang/14.0.0/lib/linux/libclang_rt.asan-x86_64.so
/usr/bin/ld: warning: -z gnu-version-script-compat ignored
[578/1320] Building CXX object projects/compiler-rt/lib/tsan/CMakeFiles/clang_rt.tsan-x86_64.dir/rtl/tsan_rtl.cpp.o
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:84:59: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
      DPrintf("#%d: TracePartAlloc: part=%p\n", thr->tid, part);
                                         ~~               ^~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:818:11: warning: format specifies type 'void *' but the argument has type '__tsan::Trace *' [-Wformat-pedantic]
          trace, trace->parts.Front(), part, pos);
          ^~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:818:18: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
          trace, trace->parts.Front(), part, pos);
                 ^~~~~~~~~~~~~~~~~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:818:40: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
          trace, trace->parts.Front(), part, pos);
                                       ^~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:818:46: warning: format specifies type 'void *' but the argument has type '__tsan::Event *' [-Wformat-pedantic]
          trace, trace->parts.Front(), part, pos);
                                             ^~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:913:11: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
          trace->parts.Front(), trace->parts.Back(),
          ^~~~~~~~~~~~~~~~~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:913:33: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
          trace->parts.Front(), trace->parts.Back(),
                                ^~~~~~~~~~~~~~~~~~~
7 warnings generated.
[579/1320] Building CXX object projects/compiler-rt/lib/tsan/CMakeFiles/clang_rt.tsan-dynamic-x86_64.dir/rtl/tsan_fd.cpp.o
compiler-rt/lib/tsan/rtl/tsan_fd.cpp:165:55: warning: format specifies type 'void *' but the argument has type '__tsan::FdSync *' [-Wformat-pedantic]
  DPrintf("#%d: FdAcquire(%d) -> %p\n", thr->tid, fd, s);
                                 ~~                   ^
compiler-rt/lib/tsan/rtl/tsan_fd.cpp:176:55: warning: format specifies type 'void *' but the argument has type '__tsan::FdSync *' [-Wformat-pedantic]
  DPrintf("#%d: FdRelease(%d) -> %p\n", thr->tid, fd, s);
                                 ~~                   ^
2 warnings generated.
[582/1320] Building CXX object projects/compiler-rt/lib/tsan/CMakeFiles/clang_rt.tsan-x86_64.dir/rtl/tsan_rtl_report.cpp.o
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp:468:71: warning: format specifies type 'void *' but the argument has type '__tsan::Trace *' [-Wformat-pedantic]
      DPrintf2("RestoreStack: tid=%d trace=%p no trace parts\n", tid, trace);
                                           ~~                         ^~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp:484:12: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
           trace->parts.Front(), last_part, last_pos);
           ^~~~~~~~~~~~~~~~~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp:484:34: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
           trace->parts.Front(), last_part, last_pos);
                                 ^~~~~~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp:484:45: warning: format specifies type 'void *' but the argument has type '__tsan::Event *' [-Wformat-pedantic]
           trace->parts.Front(), last_part, last_pos);
                                            ^~~~~~~~
4 warnings generated.
[610/1320] Building CXX object projects/compiler-rt/lib/tsan/CMakeFiles/clang_rt.tsan-dynamic-x86_64.dir/rtl/tsan_rtl.cpp.o
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:84:59: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
      DPrintf("#%d: TracePartAlloc: part=%p\n", thr->tid, part);
                                         ~~               ^~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:818:11: warning: format specifies type 'void *' but the argument has type '__tsan::Trace *' [-Wformat-pedantic]
          trace, trace->parts.Front(), part, pos);
          ^~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:818:18: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
          trace, trace->parts.Front(), part, pos);
                 ^~~~~~~~~~~~~~~~~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:818:40: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
          trace, trace->parts.Front(), part, pos);
                                       ^~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:818:46: warning: format specifies type 'void *' but the argument has type '__tsan::Event *' [-Wformat-pedantic]
          trace, trace->parts.Front(), part, pos);
                                             ^~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:913:11: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
          trace->parts.Front(), trace->parts.Back(),
          ^~~~~~~~~~~~~~~~~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl.cpp:913:33: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
          trace->parts.Front(), trace->parts.Back(),
                                ^~~~~~~~~~~~~~~~~~~
7 warnings generated.
[615/1320] Building CXX object projects/compiler-rt/lib/tsan/CMakeFiles/clang_rt.tsan-dynamic-x86_64.dir/rtl/tsan_rtl_report.cpp.o
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp:468:71: warning: format specifies type 'void *' but the argument has type '__tsan::Trace *' [-Wformat-pedantic]
      DPrintf2("RestoreStack: tid=%d trace=%p no trace parts\n", tid, trace);
                                           ~~                         ^~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp:484:12: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
           trace->parts.Front(), last_part, last_pos);
           ^~~~~~~~~~~~~~~~~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp:484:34: warning: format specifies type 'void *' but the argument has type '__tsan::TracePart *' [-Wformat-pedantic]
           trace->parts.Front(), last_part, last_pos);
                                 ^~~~~~~~~
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp:484:45: warning: format specifies type 'void *' but the argument has type '__tsan::Event *' [-Wformat-pedantic]
           trace->parts.Front(), last_part, last_pos);
                                            ^~~~~~~~

compiler-rt/CMakeLists.txt

if(LLVM_ENABLE_MODULES)
   list(APPEND SANITIZER_COMMON_CFLAGS -fno-modules)
 endif()
 
 # Turn off several warnings.
 append_list_if(COMPILER_RT_HAS_WGNU_FLAG -Wno-gnu SANITIZER_COMMON_CFLAGS)
 append_list_if(COMPILER_RT_HAS_WVARIADIC_MACROS_FLAG -Wno-variadic-macros SANITIZER_COMMON_CFLAGS)
 append_list_if(COMPILER_RT_HAS_WC99_EXTENSIONS_FLAG -Wno-c99-extensions SANITIZER_COMMON_CFLAGS)
 # format-pedantic warns about passing T* for %p, which is not useful.
-append_list_if(COMPILER_RT_HAS_WNO_FORMAT_PEDANTIC -Wno-format-pedantic SANITIZER_COMMON_CFLAGS)
 append_list_if(COMPILER_RT_HAS_WD4146_FLAG /wd4146 SANITIZER_COMMON_CFLAGS)
 append_list_if(COMPILER_RT_HAS_WD4291_FLAG /wd4291 SANITIZER_COMMON_CFLAGS)
 append_list_if(COMPILER_RT_HAS_WD4391_FLAG /wd4391 SANITIZER_COMMON_CFLAGS)
 append_list_if(COMPILER_RT_HAS_WD4722_FLAG /wd4722 SANITIZER_COMMON_CFLAGS)
 append_list_if(COMPILER_RT_HAS_WD4800_FLAG /wd4800 SANITIZER_COMMON_CFLAGS)
 
 append_list_if(MINGW -fms-extensions SANITIZER_COMMON_CFLAGS)
 

compiler-rt/lib/asan/asan_errors.cpp

static void PrintLegend(InternalScopedString *str) {
   PrintShadowByte(str, "  ASan internal:           ", kAsanInternalHeapMagic);
   PrintShadowByte(str, "  Left alloca redzone:     ", kAsanAllocaLeftMagic);
   PrintShadowByte(str, "  Right alloca redzone:    ", kAsanAllocaRightMagic);
 }
 
 static void PrintShadowBytes(InternalScopedString *str, const char *before,
                              u8 *bytes, u8 *guilty, uptr n) {
   Decorator d;
-  if (before) str->append("%s%p:", before, bytes);
+  if (before)
+    str->append("%s%p:", before, (void *)bytes);
   for (uptr i = 0; i < n; i++) {
     u8 *p = bytes + i;
     const char *before =
         p == guilty ? "[" : (p - 1 == guilty && i != 0) ? "" : " ";
     const char *after = p == guilty ? "]" : "";
     PrintShadowByte(str, before, *p, after);
   }
   str->append("\n");

compiler-rt/lib/asan/asan_fake_stack.cpp

FakeStack *FakeStack::Create(uptr stack_size_log) {
   if (stack_size_log > kMaxStackSizeLog)
     stack_size_log = kMaxStackSizeLog;
   uptr size = RequiredSize(stack_size_log);
   FakeStack *res = reinterpret_cast<FakeStack *>(
       flags()->uar_noreserve ? MmapNoReserveOrDie(size, "FakeStack")
                              : MmapOrDie(size, "FakeStack"));
   res->stack_size_log_ = stack_size_log;
   u8 *p = reinterpret_cast<u8 *>(res);
-  VReport(1, "T%d: FakeStack created: %p -- %p stack_size_log: %zd; "
+  VReport(1,
+          "T%d: FakeStack created: %p -- %p stack_size_log: %zd; "
           "mmapped %zdK, noreserve=%d \n",
-          GetCurrentTidOrInvalid(), p,
-          p + FakeStack::RequiredSize(stack_size_log), stack_size_log,
+          GetCurrentTidOrInvalid(), (void *)p,
+          (void *)(p + FakeStack::RequiredSize(stack_size_log)), stack_size_log,
           size >> 10, flags()->uar_noreserve);
   return res;
 }
 
 void FakeStack::Destroy(int tid) {
   PoisonAll(0);
   if (Verbosity() >= 2) {
     InternalScopedString str;

compiler-rt/lib/asan/asan_globals.cpp

 static void ReportGlobal(const Global &g, const char *prefix) {
   Report(
       "%s Global[%p]: beg=%p size=%zu/%zu name=%s module=%s dyn_init=%zu "
       "odr_indicator=%p\n",
       prefix, (void *)&g, (void *)g.beg, g.size, g.size_with_redzone, g.name,
       g.module_name, g.has_dynamic_init, (void *)g.odr_indicator);
   if (g.location) {
     Report("  location (%p): name=%s[%p], %d %d\n", (void *)g.location,
-           g.location->filename, g.location->filename, g.location->line_no,
-           g.location->column_no);
+           g.location->filename, (void *)g.location->filename,
+           g.location->line_no, g.location->column_no);
   }
 }
 
 static u32 FindRegistrationSite(const Global *g) {
   mu_for_globals.CheckLocked();
   CHECK(global_registration_site_vector);
   for (uptr i = 0, n = global_registration_site_vector->size(); i < n; i++) {
     GlobalRegistrationSite &grs = (*global_registration_site_vector)[i];

compiler-rt/lib/cfi/cfi.cpp

 #endif
     Trap();
   }
   if (sv.is_unchecked()) {
     VReport(2, "CFI: unchecked call (shadow=FFFF): %p\n", Ptr);
     return;
   }
   CFICheckFn cfi_check = sv.get_cfi_check();
-  VReport(2, "__cfi_check at %p\n", cfi_check);
+  VReport(2, "__cfi_check at %p\n", (void *)cfi_check);
   cfi_check(CallSiteTypeId, Ptr, DiagData);
 }
 
 void InitializeFlags() {
   SetCommonFlagsDefaults();
 #ifdef CFI_ENABLE_DIAG
   __ubsan::Flags *uf = __ubsan::flags();
   uf->SetDefaults();

compiler-rt/lib/dfsan/dfsan.cpp

static bool ProtectMemoryRange(uptr beg, uptr size, const char *name) {
   }
   return true;
 }
 
 // TODO: InitShadow is based on msan.
 // Consider refactoring these into a shared implementation.
 bool InitShadow(bool init_origins) {
   // Let user know mapping parameters first.
-  VPrintf(1, "dfsan_init %p\n", &__dfsan::dfsan_init);
+  VPrintf(1, "dfsan_init %p\n", (void *)&__dfsan::dfsan_init);
   for (unsigned i = 0; i < kMemoryLayoutSize; ++i)
     VPrintf(1, "%s: %zx - %zx\n", kMemoryLayout[i].name, kMemoryLayout[i].start,
             kMemoryLayout[i].end - 1);
 
   CheckMemoryLayoutSanity();
 
   if (!MEM_IS_APP(&__dfsan::dfsan_init)) {
     Printf("FATAL: Code %p is out of application range. Non-PIE build?\n",

compiler-rt/lib/hwasan/hwasan_report.cpp

static void PrintTagInfoAroundAddr(tag_t *tag_ptr, uptr num_rows,
   const uptr row_len = 16;  // better be power of two.
   tag_t *center_row_beg = reinterpret_cast<tag_t *>(
       RoundDownTo(reinterpret_cast<uptr>(tag_ptr), row_len));
   tag_t *beg_row = center_row_beg - row_len * (num_rows / 2);
   tag_t *end_row = center_row_beg + row_len * ((num_rows + 1) / 2);
   InternalScopedString s;
   for (tag_t *row = beg_row; row < end_row; row += row_len) {
     s.append("%s", row == center_row_beg ? "=>" : "  ");
-    s.append("%p:", row);
+    s.append("%p:", (void *)row);
     for (uptr i = 0; i < row_len; i++) {
       s.append("%s", row + i == tag_ptr ? "[" : " ");
       print_tag(s, &row[i]);
       s.append("%s", row + i == tag_ptr ? "]" : " ");
     }
     s.append("\n");
   }
   Printf("%s", s.data());

compiler-rt/lib/hwasan/hwasan_thread.cpp

void Thread::Destroy() {
   // Instrumented code can not run on this thread from this point onwards, but
   // malloc/free can still be served. Glibc may call free() very late, after all
   // TSD destructors are done.
   CHECK_EQ(GetCurrentThread(), this);
   *GetCurrentThreadLongPtr() = 0;
 }
 
 void Thread::Print(const char *Prefix) {
-  Printf("%sT%zd %p stack: [%p,%p) sz: %zd tls: [%p,%p)\n", Prefix,
-         unique_id_, this, stack_bottom(), stack_top(),
-         stack_top() - stack_bottom(),
-         tls_begin(), tls_end());
+  Printf("%sT%zd %p stack: [%p,%p) sz: %zd tls: [%p,%p)\n", Prefix, unique_id_,
+         (void *)this, stack_bottom(), stack_top(),
+         stack_top() - stack_bottom(), tls_begin(), tls_end());
 }
 
 static u32 xorshift(u32 state) {
   state ^= state << 13;
   state ^= state >> 17;
   state ^= state << 5;
   return state;
 }

compiler-rt/lib/memprof/memprof_thread.cpp

void MemprofThread::Init(const InitOptions *options) {
   if (stack_top_ != stack_bottom_) {
     CHECK_GT(this->stack_size(), 0U);
     CHECK(AddrIsInMem(stack_bottom_));
     CHECK(AddrIsInMem(stack_top_ - 1));
   }
   int local = 0;
   VReport(1, "T%d: stack [%p,%p) size 0x%zx; local=%p\n", tid(),
           (void *)stack_bottom_, (void *)stack_top_, stack_top_ - stack_bottom_,
-          &local);
+          (void *)&local);
 }
 
 thread_return_t
 MemprofThread::ThreadStart(tid_t os_id,
                            atomic_uintptr_t *signal_thread_is_registered) {
   Init();
   memprofThreadRegistry().StartThread(tid(), os_id, ThreadType::Regular,
                                       nullptr);
MemprofThreadContext *context =
       reinterpret_cast<MemprofThreadContext *>(TSDGet());
   if (!context)
     return nullptr;
   return context->thread;
 }
 
 void SetCurrentThread(MemprofThread *t) {
   CHECK(t->context());
-  VReport(2, "SetCurrentThread: %p for thread %p\n", t->context(),
+  VReport(2, "SetCurrentThread: %p for thread %p\n", (void *)t->context(),
           (void *)GetThreadSelf());
   // Make sure we do not reset the current MemprofThread.
   CHECK_EQ(0, TSDGet());
   TSDSet(t->context());
   CHECK_EQ(t->context(), TSDGet());
 }
 
 u32 GetCurrentTidOrInvalid() {

compiler-rt/lib/msan/msan.cpp

 
 void __msan_dump_shadow(const void *x, uptr size) {
   if (!MEM_IS_APP(x)) {
     Printf("Not a valid application address: %p\n", x);
     return;
   }
 
   unsigned char *s = (unsigned char*)MEM_TO_SHADOW(x);
-  Printf("%p[%p]  ", s, x);
+  Printf("%p[%p]  ", (void *)s, x);
   for (uptr i = 0; i < size; i++)
     Printf("%x%x ", s[i] >> 4, s[i] & 0xf);
   Printf("\n");
 }
 
 sptr __msan_test_shadow(const void *x, uptr size) {
   if (!MEM_IS_APP(x)) return -1;
   unsigned char *s = (unsigned char *)MEM_TO_SHADOW((uptr)x);

compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp

case 'M':
         // Always strip the module name for %M.
         RenderModuleLocation(buffer, StripModuleName(info->module),
                              info->module_offset, info->module_arch, "");
       } else {
         buffer->append("(%p)", (void *)address);
       }
       break;
     default:
-      Report("Unsupported specifier in stack frame format: %c (%p)!\n", *p, p);
+      Report("Unsupported specifier in stack frame format: %c (%p)!\n", *p,
+             (void *)p);
       Die();
     }
   }
 }
 
 bool RenderNeedsSymbolization(const char *format) {
   if (0 == internal_strcmp(format, "DEFAULT"))
     format = kDefaultFormat;
switch (*p) {
       case 'l':
         buffer->append("%zu", DI->line);
         break;
       case 'g':
         buffer->append("%s", DI->name);
         break;
       default:
         Report("Unsupported specifier in stack frame format: %c (%p)!\n", *p,
-               p);
+               (void *)p);
         Die();
     }
   }
 }
 
 #endif  // !SANITIZER_SYMBOLIZER_MARKUP
 
 void RenderSourceLocation(InternalScopedString *buffer, const char *file,

compiler-rt/lib/xray/xray_x86_64.cpp

bool patchFunctionEntry(const bool Enable, const uint32_t FuncId,
   // 4. Do an atomic write over the jmp instruction for the "mov r10d"
   // opcode and first operand.
   //
   // Prerequisite is to compute the relative offset to the trampoline's address.
   const uint64_t Address = Sled.address();
   int64_t TrampolineOffset = reinterpret_cast<int64_t>(Trampoline) -
                              (static_cast<int64_t>(Address) + 11);
   if (TrampolineOffset < MinOffset || TrampolineOffset > MaxOffset) {
-    Report("XRay Entry trampoline (%p) too far from sled (%p)\n", Trampoline,
+    Report("XRay Entry trampoline (%p) too far from sled (%p)\n",
+           reinterpret_cast<void *>(Trampoline),
            reinterpret_cast<void *>(Address));
     return false;
   }
   if (Enable) {
     *reinterpret_cast<uint32_t *>(Address + 2) = FuncId;
     *reinterpret_cast<uint8_t *>(Address + 6) = CallOpCode;
     *reinterpret_cast<uint32_t *>(Address + 7) = TrampolineOffset;
     std::atomic_store_explicit(
         reinterpret_cast<std::atomic<uint16_t> *>(Address), MovR10Seq,
         std::memory_order_release);
bool patchFunctionExit(const bool Enable, const uint32_t FuncId,
   //
   // Prerequisite is to compute the relative offset fo the
   // __xray_FunctionExit function's address.
   const uint64_t Address = Sled.address();
   int64_t TrampolineOffset = reinterpret_cast<int64_t>(__xray_FunctionExit) -
                              (static_cast<int64_t>(Address) + 11);
   if (TrampolineOffset < MinOffset || TrampolineOffset > MaxOffset) {
     Report("XRay Exit trampoline (%p) too far from sled (%p)\n",
-           __xray_FunctionExit, reinterpret_cast<void *>(Address));
+           reinterpret_cast<void *>(__xray_FunctionExit),
+           reinterpret_cast<void *>(Address));
     return false;
   }
   if (Enable) {
     *reinterpret_cast<uint32_t *>(Address + 2) = FuncId;
     *reinterpret_cast<uint8_t *>(Address + 6) = JmpOpCode;
     *reinterpret_cast<uint32_t *>(Address + 7) = TrampolineOffset;
     std::atomic_store_explicit(
         reinterpret_cast<std::atomic<uint16_t> *>(Address), MovR10Seq,
bool patchFunctionTailExit(const bool Enable, const uint32_t FuncId,
   // Here we do the dance of replacing the tail call sled with a similar
   // sequence as the entry sled, but calls the tail exit sled instead.
   const uint64_t Address = Sled.address();
   int64_t TrampolineOffset =
       reinterpret_cast<int64_t>(__xray_FunctionTailExit) -
       (static_cast<int64_t>(Address) + 11);
   if (TrampolineOffset < MinOffset || TrampolineOffset > MaxOffset) {
     Report("XRay Tail Exit trampoline (%p) too far from sled (%p)\n",
-           __xray_FunctionTailExit, reinterpret_cast<void *>(Address));
+           reinterpret_cast<void *>(__xray_FunctionTailExit),
+           reinterpret_cast<void *>(Address));
     return false;
   }
   if (Enable) {
     *reinterpret_cast<uint32_t *>(Address + 2) = FuncId;
     *reinterpret_cast<uint8_t *>(Address + 6) = CallOpCode;
     *reinterpret_cast<uint32_t *>(Address + 7) = TrampolineOffset;
     std::atomic_store_explicit(
         reinterpret_cast<std::atomic<uint16_t> *>(Address), MovR10Seq,