googlewalt wrote: I don't have any expertise in this code, but it looks like it shouldn't break anything and fixes a bunch of build breakages, so I'm going to check it in. https://github.com/llvm/llvm-project/pull/141687