linehill wrote: Ping @jhuber6. This PR has same fixes as in https://github.com/llvm/llvm-project/commit/9ae6d8f565515a0199b18d6f156b1a41f328af1a but additionally covers couple missed spots. https://github.com/llvm/llvm-project/pull/178664