Fix -Wreturn-type build failure on ASTMatchers, plus an intended assert

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