Fix the 3 regressions last night, due to my buggy patch from yesterday.


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