steakhal wrote: > This PR should probably not be stacked on anything. Yes. Just do an interactive rebase against llvm/main and drop the lines (commits) that are irrelevant. https://github.com/llvm/llvm-project/pull/212254