[ubsan] Replace CommonSanitizerReportMutex with ScopedErrorReportLock

[vitalybuka]

Rebase

[vitalybuka]

Rebase

compiler-rt/lib/sanitizer_common/sanitizer_common.h

 // FIXME: Replace with ScopedErrorReportLock and hide.
 extern StaticSpinMutex CommonSanitizerReportMutex;
 
 // Lock sanitizer error reporting and protects against nested errors.
 class ScopedErrorReportLock {
  public:
   explicit ScopedErrorReportLock(u32 current_tid);
   ~ScopedErrorReportLock();
+
+  static void CheckLocked();
 };
 
 extern uptr stoptheworld_tracer_pid;
 extern uptr stoptheworld_tracer_ppid;
 
 // Opens the file 'file_name" and reads up to 'max_len' bytes.
 // The resulting buffer is mmaped and stored in '*buff'.
 // The size of the mmaped region is stored in '*buff_size'.

compiler-rt/lib/sanitizer_common/sanitizer_common.cc

ScopedErrorReportLock::ScopedErrorReportLock(u32 current_tid) {
   }
 }
 
 ScopedErrorReportLock::~ScopedErrorReportLock() {
   CommonSanitizerReportMutex.Unlock();
   atomic_store_relaxed(&reporting_thread_tid, kUnclaimedTid);
 }
 
+void ScopedErrorReportLock::CheckLocked() {
+  CommonSanitizerReportMutex.CheckLocked();
+}
+
 } // namespace __sanitizer
 
 using namespace __sanitizer;  // NOLINT
 
 extern "C" {
 SANITIZER_INTERFACE_WEAK_DEF(void, __sanitizer_report_error_summary,
                              const char *error_summary) {
   Printf("%s\n", error_summary);

compiler-rt/lib/ubsan/ubsan_diag.h

 void GetStackTraceWithPcBpAndContext(BufferedStackTrace *stack, uptr max_depth,
                                      uptr pc, uptr bp, void *context,
                                      bool fast);
 
 /// \brief Instantiate this class before printing diagnostics in the error
 /// report. This class ensures that reports from different threads and from
 /// different sanitizers won't be mixed.
 class ScopedReport {
+  ScopedErrorReportLock report_lock_;
+
   ReportOptions Opts;
   Location SummaryLoc;
   ErrorType Type;
 
 public:
   ScopedReport(ReportOptions Opts, Location SummaryLoc, ErrorType Type);
   ~ScopedReport();
+
+  static void CheckLocked() { ScopedErrorReportLock::CheckLocked(); }
 };
 
 void InitializeSuppressions();
 bool IsVptrCheckSuppressed(const char *TypeName);
 // Sometimes UBSan runtime can know filename from handlers arguments, even if
 // debug info is missing.
 bool IsPCSuppressed(ErrorType ET, uptr PC, const char *Filename);
 
 } // namespace __ubsan
 
 #endif // UBSAN_DIAG_H

compiler-rt/lib/ubsan/ubsan_diag.cc

static void PrintMemorySnippet(const Decorator &Decor, MemoryLocation Loc,
   //    determine whether the value of that range is a pointer to an
   //    entity which we can name, and if so, print that name.
   //
   // This needs an external symbolizer, or (preferably) ASan instrumentation.
 }
 
 Diag::~Diag() {
   // All diagnostics should be printed under report mutex.
-  CommonSanitizerReportMutex.CheckLocked();
+  ScopedReport::CheckLocked();
   Decorator Decor;
   InternalScopedString Buffer(1024);
 
   Buffer.append(Decor.Bold());
   RenderLocation(&Buffer, Loc);
   Buffer.append(":");
 
   switch (Level) {
Diag::~Diag() {
 
   Buffer.append("%s\n", Decor.Default());
   Printf("%s", Buffer.data());
 
   if (Loc.isMemoryLocation())
     PrintMemorySnippet(Decor, Loc.getMemoryLocation(), Ranges, NumRanges, Args);
 }
 
-ScopedReport::ScopedReport(ReportOptions Opts, Location SummaryLoc,
-                           ErrorType Type)
-    : Opts(Opts), SummaryLoc(SummaryLoc), Type(Type) {
+static tid_t InitializeAndGetTid() {
   InitAsStandaloneIfNecessary();
-  CommonSanitizerReportMutex.Lock();
+  return GetTid();
 }
 
+ScopedReport::ScopedReport(ReportOptions Opts, Location SummaryLoc,
+                           ErrorType Type)
+    : report_lock_(InitializeAndGetTid()), Opts(Opts), SummaryLoc(SummaryLoc),
+      Type(Type) {}
+
 ScopedReport::~ScopedReport() {
   MaybePrintStackTrace(Opts.pc, Opts.bp);
   MaybeReportErrorSummary(SummaryLoc, Type);
-  CommonSanitizerReportMutex.Unlock();
   if (flags()->halt_on_error)
     Die();
 }
 
 ALIGNED(64) static char suppression_placeholder[sizeof(SuppressionContext)];
 static SuppressionContext *suppression_ctx = nullptr;
 static const char kVptrCheck[] = "vptr_check";
 static const char *kSuppressionTypes[] = {