This closes PR14709 and hopefully is a small step towards preventing
similar issues in the future.

llvm-svn: 171837