https://github.com/FedericoBruzzone approved this pull request. I think we can proceed with this PR, and once this PR is landed, we can close #217514. Overall, LGTM % nit! Thank you a lot for your patience, and sorry for the delay. https://github.com/llvm/llvm-project/pull/234448