Skip to content

Conversation

gbMattN
Copy link
Contributor

@gbMattN gbMattN commented May 14, 2025

…rect 'reason' when constructing ErrorBase

@llvmbot
Copy link
Member

llvmbot commented May 14, 2025

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

Author: None (gbMattN)

Changes

…rect 'reason' when constructing ErrorBase


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

1 Files Affected:

  • (modified) compiler-rt/lib/asan/asan_errors.h (+1-1)
diff --git a/compiler-rt/lib/asan/asan_errors.h b/compiler-rt/lib/asan/asan_errors.h
index b3af655e66639..f339b35d2a764 100644
--- a/compiler-rt/lib/asan/asan_errors.h
+++ b/compiler-rt/lib/asan/asan_errors.h
@@ -362,7 +362,7 @@ struct ErrorBadParamsToCopyContiguousContainerAnnotations : ErrorBase {
       u32 tid, BufferedStackTrace *stack_, uptr old_storage_beg_,
       uptr old_storage_end_, uptr new_storage_beg_, uptr new_storage_end_)
       : ErrorBase(tid, 10,
-                  "bad-__sanitizer_annotate_double_ended_contiguous_container"),
+                  "bad-__sanitizer_copy_contiguous_container_annotations"),
         stack(stack_),
         old_storage_beg(old_storage_beg_),
         old_storage_end(old_storage_end_),

@davidmrdavid
Copy link
Contributor

Just from pattern matching with the constructor name, this seems like the right fix 👍

Copy link
Member

@AdvenamTacet AdvenamTacet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thx!

Copy link

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:
git-clang-format --diff origin/main HEAD --extensions h -- compiler-rt/lib/asan/asan_errors.h

⚠️
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing origin/main to the base branch/commit you want to compare against.
⚠️

View the diff from clang-format here.
diff --git a/compiler-rt/lib/asan/asan_errors.h b/compiler-rt/lib/asan/asan_errors.h
index f339b35d2..81103ffe0 100644
--- a/compiler-rt/lib/asan/asan_errors.h
+++ b/compiler-rt/lib/asan/asan_errors.h
@@ -359,7 +359,7 @@ struct ErrorBadParamsToCopyContiguousContainerAnnotations : ErrorBase {
 
   ErrorBadParamsToCopyContiguousContainerAnnotations() = default;  // (*)
   ErrorBadParamsToCopyContiguousContainerAnnotations(
-      u32 tid, BufferedStackTrace *stack_, uptr old_storage_beg_,
+      u32 tid, BufferedStackTrace* stack_, uptr old_storage_beg_,
       uptr old_storage_end_, uptr new_storage_beg_, uptr new_storage_end_)
       : ErrorBase(tid, 10,
                   "bad-__sanitizer_copy_contiguous_container_annotations"),

@gbMattN gbMattN merged commit 492089e into llvm:main Aug 28, 2025
8 of 9 checks passed
@llvm-ci
Copy link
Collaborator

llvm-ci commented Aug 28, 2025

LLVM Buildbot has detected a new failure on builder amdgpu-offload-rhel-9-cmake-build-only running on rocm-docker-rhel-9 while building compiler-rt at step 2 "update-annotated-scripts".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/205/builds/20224

Here is the relevant piece of the build log for the reference
Step 2 (update-annotated-scripts) failure: update (failure)
git version 2.43.5
fatal: unable to access 'https://github.com/llvm/llvm-zorg.git/': Failed to connect to github.com port 443: Connection timed out
fatal: unable to access 'https://github.com/llvm/llvm-zorg.git/': Failed to connect to github.com port 443: Connection timed out

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