Skip to content

[NFC][ubsan_minimal] Clang-format a file #139000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

vitalybuka
Copy link
Collaborator

No description provided.

vitalybuka added 2 commits May 7, 2025 17:43

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Created using spr 1.3.4

[skip ci]
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 thurstond and kstoimenov 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
rebase
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.

None yet

4 participants