benlimpa wrote: Thanks! I was trying to follow how it was done in #87081 but you’re right, I guess the special cases aren't needed here. I’ve pushed a new commit that simplifies to your suggestion. https://github.com/llvm/llvm-project/pull/237452