arsenm added a comment. I've tried applying this but getting some build errors. You also have some remaining trailing whitespace and extra whitespace changes CHANGES SINCE LAST ACTION https://reviews.llvm.org/D93708/new/ https://reviews.llvm.org/D93708