Actually update tests w.r.t 9e5a77f252 and reland https://github.com/llvm/llvm-project/pull/73056
9e5a77f252
or disjoint