Reapply r63025 and r63026, with fixes for the failing testcases.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63049 91177308-0d34-0410-b5e6-96231b3b80d8
1 file changed