https://github.com/paulwalker-arm approved this pull request. Looks good to me. I'm happy for the default case to be cleaned up as a separate patch but if you'd rather do it here then I'll just re-review the updates. https://github.com/llvm/llvm-project/pull/83001