jayfoad wrote: This is mostly so that we don't need to carry this change downstream, while we have downstream patches that add a few builtin types. It seems inevitable that it will need to be changed upstream pretty soon anyway. https://github.com/llvm/llvm-project/pull/113559