https://github.com/keith approved this pull request. this fixes some portion of the broken stuff now, there are more things needed after https://github.com/llvm/llvm-project/pull/190577