DavidSpickett wrote: I don't have the time / expertise to fix this in Tablegen right now. So I have applied Mehdi's first suggestion to change the type used, and hope I can leave it to others to do a more complex fix if they wish to. https://github.com/llvm/llvm-project/pull/168850