This is a clearer separation of concerns and makes it easier to reuse the function. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251481 91177308-0d34-0410-b5e6-96231b3b80d8