Some minimal LLVM15 compat (#44870)

Commit

3 years ago

Some minimal LLVM15 compat (#44870) just a drive-by as I was trying out some commits on master