https://github.com/gysit approved this pull request. Thanks for fixing, I like this solution. LGTM modulo nit comments. If we can add guardrails in tablegen that would be great. But that would be something for a separate PR. https://github.com/llvm/llvm-project/pull/135772