arsenm added a comment. LGTM, I don't think it's avoidable since the renumbering of the hardcoded indexes is the painful part Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D70871/new/ https://reviews.llvm.org/D70871