Match if / elseif properly
Match if / elseif properly

My last commit fumbled it.

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

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