Backport fix for #135522 to the 20.x branch

[HighCommander4]

I would like to backport #135757 (which fixes #135522) to the 20.x branch.

This is a 20.x diagnostic regression with a low-risk fix.

[HighCommander4]

/cherry-pick 289baf1

[llvmbot]

@llvm/issue-subscribers-clang-frontend

Author: Nathan Ridge (HighCommander4)

I would like to backport #135757 (which fixes #135522) to the 20.x branch.

This is a 20.x diagnostic regression with a low-risk fix.

[llvmbot]

Failed to cherry-pick: 289baf1

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

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

[HighCommander4]

Backport PR: #135927