[clang] More fixes for P3144R2 implementation (PR #149406)

[Harald van Dijk via cfe-commits]

hvdijk wrote:

Apologies for the repeated review request, not sure why GitHub removed one when I only tried to request an additional reviewer.

https://github.com/llvm/llvm-project/pull/149406