tuliom wrote: OK. I modified this PR in order to only make the changes that fix #73145 . Sorting will remain broken as it has been since 2021. I will provide another PR after this one gets merged. https://github.com/llvm/llvm-project/pull/73146