https://github.com/arsenm commented: This looks like a brute force fixup (and also passes for me as-is). Can you more directly avoid this being a problem in the upstream computation? https://github.com/llvm/llvm-project/pull/199974