[clang] [clang][CodeGen] Additional fixes for #114062 (PR #128166)

[Joseph Huber via cfe-commits]

https://github.com/jhuber6 approved this pull request.

I think it's reasonable and we should probably get this in before the release window.

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