https://github.com/RKSimon commented: its very difficult to diff this to check for any unintended changes that could creep in - is there no way we can simplify the changes more? https://github.com/llvm/llvm-project/pull/134132