Fix Werror introduced at r200874.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200891 91177308-0d34-0410-b5e6-96231b3b80d8
Simplify code by combining ifs.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200893 91177308-0d34-0410-b5e6-96231b3b80d8