Also simplify the constraints generated by the checker. 

Differential Revision: https://reviews.llvm.org/D23112


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