https://github.com/amy-kwan approved this pull request. Sorry for the delay in getting back to the patch. I think the patch is fine currently and I am OK with addressing the TODOs/FIXMEs after the patch/in the future. https://github.com/llvm/llvm-project/pull/154901