https://github.com/krzysz00 approved this pull request. I assume the change to OperationState / OpBuilder is in a future PR? With that note, I think this is fine, let's land it https://github.com/llvm/llvm-project/pull/219194