https://github.com/fhahn approved this pull request. LGTM, should be good to go now that the changed has been re-landed as 9b1b93766dfa34ee94859d91a5fcfef853b95265 https://github.com/llvm/llvm-project/pull/157518