Skip to content

Conversation

@vitalybuka
Copy link
Collaborator

No description provided.

vitalybuka added 2 commits May 7, 2025 17:43
Created using spr 1.3.4
@llvmbot
Copy link
Member

llvmbot commented May 8, 2025

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Vitaly Buka (vitalybuka)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/139000.diff

1 Files Affected:

  • (modified) compiler-rt/lib/ubsan_minimal/ubsan_minimal_handlers.cpp (+7-7)
diff --git a/compiler-rt/lib/ubsan_minimal/ubsan_minimal_handlers.cpp b/compiler-rt/lib/ubsan_minimal/ubsan_minimal_handlers.cpp
index 9c03ddf7d063c..ebc36a8583e05 100644
--- a/compiler-rt/lib/ubsan_minimal/ubsan_minimal_handlers.cpp
+++ b/compiler-rt/lib/ubsan_minimal/ubsan_minimal_handlers.cpp
@@ -1,7 +1,7 @@
 #include "sanitizer_common/sanitizer_atomic.h"
 
-#include <stdlib.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -9,9 +9,7 @@
 extern "C" void ubsan_message(const char *msg);
 static void message(const char *msg) { ubsan_message(msg); }
 #else
-static void message(const char *msg) {
-  (void)write(2, msg, strlen(msg));
-}
+static void message(const char *msg) { (void)write(2, msg, strlen(msg)); }
 #endif
 
 static const int kMaxCallerPcs = 20;
@@ -62,16 +60,18 @@ SANITIZER_INTERFACE_WEAK_DEF(void, __ubsan_report_error, const char *kind,
       uintptr_t p;
       for (unsigned i = 0; i < sz; ++i) {
         p = __sanitizer::atomic_load_relaxed(&caller_pcs[i]);
-        if (p == 0) break;  // Concurrent update.
+        if (p == 0)
+          break; // Concurrent update.
         if (p == caller)
           return;
       }
-      if (p == 0) continue;  // FIXME: yield?
+      if (p == 0)
+        continue; // FIXME: yield?
     }
 
     if (!__sanitizer::atomic_compare_exchange_strong(
             &caller_pcs_sz, &sz, sz + 1, __sanitizer::memory_order_seq_cst))
-      continue;  // Concurrent update! Try again from the start.
+      continue; // Concurrent update! Try again from the start.
 
     if (sz == kMaxCallerPcs) {
       message("ubsan: too many errors\n");

@vitalybuka vitalybuka requested review from kstoimenov and thurstond May 8, 2025 00:44
vitalybuka added 2 commits May 8, 2025 00:08
Created using spr 1.3.4

[skip ci]
Created using spr 1.3.4
@vitalybuka vitalybuka changed the base branch from users/vitalybuka/spr/main.nfcubsan_minimal-clang-format-a-file to main May 8, 2025 21:41
Created using spr 1.3.4
@vitalybuka vitalybuka merged commit 856632b into main May 8, 2025
3 of 5 checks passed
@vitalybuka vitalybuka deleted the users/vitalybuka/spr/nfcubsan_minimal-clang-format-a-file branch May 8, 2025 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants