https://github.com/EricWF approved this pull request. OK, I've done my due diligence offline, and this seems like a not incorrect fix. Though as a general note, I think our tests have become too clever. https://github.com/llvm/llvm-project/pull/74667