Address post-commit comments for https://reviews.llvm.org/D29596. NFCI.
Address post-commit comments for https://reviews.llvm.org/D29596. NFCI.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@294985 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 47946adf7753909a580d04ddd5b2bd5a85f6c7a0)

apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm