Re-committing the failed r97807 commit with changes to eliminate warnings.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97891 91177308-0d34-0410-b5e6-96231b3b80d8
7 files changed