llvm-upgrade because nobody noticed them failing. Update to use new syntax and actually check for the right failure by looking at the error message. llvm-svn: 48417
llvm-svn: 33296