Skip to content

Conversation

@vsapsai
Copy link
Collaborator

@vsapsai vsapsai commented Jul 21, 2025

No description provided.

@vsapsai vsapsai requested review from AaronBallman and shafik July 21, 2025 17:34
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Jul 21, 2025
@llvmbot
Copy link
Member

llvmbot commented Jul 21, 2025

@llvm/pr-subscribers-clang

Author: Volodymyr Sapsai (vsapsai)

Changes

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

1 Files Affected:

  • (modified) clang/docs/ReleaseNotes.rst (+2)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 81483c12c8fe9..d0e95c6499830 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -814,6 +814,8 @@ Bug Fixes in This Version
 - Fixed a failed assertion with an operator call expression which comes from a
   macro expansion when performing analysis for nullability attributes. (#GH138371)
 - Fixed a concept equivalent checking crash due to untransformed constraint expressions. (#GH146614)
+- Fixed a crash in `clang-scan-deps` when a module with the same name is found
+  in different locations (#GH134404, #GH146976).
 
 Bug Fixes to Compiler Builtins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@vsapsai
Copy link
Collaborator Author

vsapsai commented Jul 21, 2025

Adding a release note as discussed in #146976 .

Copy link
Collaborator

@AaronBallman AaronBallman left a comment

Choose a reason for hiding this comment

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

LGTM! We need to make sure this gets cherry picked to the release branch too.

@vsapsai
Copy link
Collaborator Author

vsapsai commented Jul 21, 2025

Do you mean cherry-picked into LLVM-21? I can see the fix in llvmorg-21.1.0-rc1 and llvmorg-22-init, and expect the documentation to be present for llvm-22 automatically.

@AaronBallman
Copy link
Collaborator

Do you mean cherry-picked into LLVM-21? I can see the fix in llvmorg-21.1.0-rc1 and llvmorg-22-init, and expect the documentation to be present for llvm-22 automatically.

Correct, cherry-picked into the 21.x branch. The fix is in 21 but the release note is missing from it unless we cherry-pick this after it lands.

Btw, documentation build failure is unrelated.

@vsapsai vsapsai merged commit dbc41dd into llvm:main Jul 23, 2025
10 checks passed
@vsapsai vsapsai deleted the clang-scan-deps-release-note branch July 23, 2025 00:16
@vsapsai vsapsai added this to the LLVM 21.x Release milestone Jul 23, 2025
@github-project-automation github-project-automation bot moved this to Needs Triage in LLVM Release Status Jul 23, 2025
@vsapsai
Copy link
Collaborator Author

vsapsai commented Jul 23, 2025

/cherry-pick dbc41dd

@llvmbot
Copy link
Member

llvmbot commented Jul 23, 2025

Failed to cherry-pick: dbc41dd

https://github.com/llvm/llvm-project/actions/runs/16473314938

Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request

vsapsai added a commit to vsapsai/llvm-project that referenced this pull request Jul 23, 2025
@tru tru moved this from Needs Triage to Needs Backport PR in LLVM Release Status Jul 24, 2025
tru pushed a commit to vsapsai/llvm-project that referenced this pull request Jul 24, 2025
mahesh-attarde pushed a commit to mahesh-attarde/llvm-project that referenced this pull request Jul 28, 2025
@tru tru moved this from Needs Backport PR to Done in LLVM Release Status Aug 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clang Clang issues not falling into any other category release:cherry-pick-failed

Projects

Development

Successfully merging this pull request may close these issues.

3 participants