[scudo] Make the placeholder type specifier be consistent with C/C++

[Chia-hungDuan]

Summary

This avoids -Wformat complains the placeholder type specifier mismatch
on lld/llu(used for s64/u64) which have slightly different
interpretation in string_utils.cpp.

Also enable Timer build which was disabled because of the complaining of
-Wformat.

[cferris]

Comment nit.

compiler-rt/lib/scudo/standalone/string_utils.cpp

202

silence

[Chia-hungDuan]

Address review comment

[cferris]

LGTM

compiler-rt/lib/scudo/standalone/CMakeLists.txt

set(SCUDO_HEADERS
   release.h
   report.h
   rss_limit_checker.h
   secondary.h
   size_class_map.h
   stack_depot.h
   stats.h
   string_utils.h
-  # TODO(chiahungduan): Temporarily disable the timer because of the print
-  # of u64 has incorrect placeholder.
-  # timing.h
+  timing.h
   tsd_exclusive.h
   tsd_shared.h
   tsd.h
   vector.h
   wrappers_c_checks.h
   wrappers_c.h
 
   include/scudo/interface.h
   )
 
 set(SCUDO_SOURCES
   checksum.cpp
   common.cpp
   crc32_hw.cpp
   flags_parser.cpp
   flags.cpp
   fuchsia.cpp
   linux.cpp
   release.cpp
   report.cpp
   rss_limit_checker.cpp
   string_utils.cpp
-  # TODO(chiahungduan): Temporarily disable the timer because of the print
-  # of u64 has incorrect placeholder.
-  # timing.cpp
+  timing.cpp
   )
 
 # Enable the necessary instruction set for scudo_crc32.cpp, if available.
 # Newer compiler versions use -mcrc32 rather than -msse4.2.
 if (COMPILER_RT_HAS_MCRC32_FLAG)
   set_source_files_properties(crc32_hw.cpp PROPERTIES COMPILE_FLAGS -mcrc32)
 elseif (COMPILER_RT_HAS_MSSE4_2_FLAG)
   set_source_files_properties(crc32_hw.cpp PROPERTIES COMPILE_FLAGS -msse4.2)

compiler-rt/lib/scudo/standalone/string_utils.cpp

case 's': {
       break;
     }
     case 'c': {
       RAW_CHECK_MSG(!HaveFlags, PrintfFormatsHelp);
       Res +=
           appendChar(&Buffer, BufferEnd, static_cast<char>(va_arg(Args, int)));
       break;
     }
+    // In Scudo, `s64`/`u64` are supposed to use `lld` and `llu` respectively.
+    // However, `-Wformat` doesn't know we have a different parser for those
+    // placeholders and it keeps complaining the type mismatch on 64-bit
+    // platform which uses `ld`/`lu` for `s64`/`u64`. Therefore, in order to
+    // silence the warning, we turn to use `PRId64`/`PRIu64` for printing
+    // `s64`/`u64` and handle the `ld`/`lu` here.
+    case 'l': {
+      ++Cur;
+      RAW_CHECK(*Cur == 'd' || *Cur == 'u');
+
+      if (*Cur == 'd') {
+        DVal = va_arg(Args, s64);
+        Res +=
+            appendSignedDecimal(&Buffer, BufferEnd, DVal, Width, PadWithZero);
+      } else {
+        UVal = va_arg(Args, u64);
+        Res += appendUnsigned(&Buffer, BufferEnd, UVal, 10, Width, PadWithZero,
+                              false);
+      }
+
+      break;
+    }
     case '%': {
       RAW_CHECK_MSG(!HaveFlags, PrintfFormatsHelp);
       Res += appendChar(&Buffer, BufferEnd, '%');
       break;
     }
     default: {
       RAW_CHECK_MSG(false, PrintfFormatsHelp);
     }

compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt

set(SCUDO_UNIT_TEST_SOURCES
   primary_test.cpp
   quarantine_test.cpp
   release_test.cpp
   report_test.cpp
   secondary_test.cpp
   size_class_map_test.cpp
   stats_test.cpp
   strings_test.cpp
-  # TODO(chiahungduan): Temporarily disable the timer test because of the print
-  # of u64 has incorrect placeholder.
-  # timing_test.cpp
+  timing_test.cpp
   tsd_test.cpp
   vector_test.cpp
   scudo_unit_test_main.cpp
   )
 
 add_scudo_unittest(ScudoUnitTest
   SOURCES ${SCUDO_UNIT_TEST_SOURCES})
 

compiler-rt/lib/scudo/standalone/timing.h

 //===-- timing.h ------------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef SCUDO_TIMING_H_
 #define SCUDO_TIMING_H_
 
 #include "common.h"
 #include "mutex.h"
 #include "string_utils.h"
 #include "thread_annotations.h"
 
+#include <inttypes.h>
 #include <string.h>
 
 namespace scudo {
 
 class TimingManager;
 
 // A simple timer for evaluating execution time of code snippets. It can be used
 // along with TimingManager or standalone.
void printImpl(ScopedString &Str, const u32 HandleId,
     const u64 Occurrence = TimerRecords[HandleId].Occurrence;
     const u64 Integral = Occurrence == 0 ? 0 : AccumulatedTime / Occurrence;
     // Only keep single digit of fraction is enough and it enables easier layout
     // maintenance.
     const u64 Fraction =
         Occurrence == 0 ? 0
                         : ((AccumulatedTime % Occurrence) * 10) / Occurrence;
 
-    Str.append("%14lu.%lu(ns) %-11s", Integral, Fraction, " ");
+    Str.append("%14" PRId64 ".%" PRId64 "(ns) %-11s", Integral, Fraction, " ");
 
     for (u32 I = 0; I < ExtraIndent; ++I)
       Str.append("%s", "  ");
-    Str.append("%s (%lu)\n", Timers[HandleId].Name, Occurrence);
+    Str.append("%s (%" PRId64 ")\n", Timers[HandleId].Name, Occurrence);
 
     for (u32 I = 0; I < NumAllocatedTimers; ++I)
       if (Timers[I].Nesting == HandleId)
         printImpl(Str, I, ExtraIndent + 1);
   }
 
   // Instead of maintaining pages for timer registration, a static buffer is
   // sufficient for most use cases in Scudo.