https://github.com/mgorny approved this pull request. I can confirm that this fixes the test. Thanks! Do you think we could backport it to 21.x? It's not a big deal but would get a clean pass there. https://github.com/llvm/llvm-project/pull/156740