I reverted the error check that was removed in 236416. I put the it in a separate file. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237107 91177308-0d34-0410-b5e6-96231b3b80d8