arsenm wrote: Plus I really do not want to generate more conflicts with #150869 and the other patches I have to post on top of that. This is still bootstrapping to a different system https://github.com/llvm/llvm-project/pull/162194