Drive-by fix of incorrect diagnostic, and a test case for said diagnostic. The...

Drive-by fix of incorrect diagnostic, and a test case for said diagnostic. The double error is unfortunate, but I really don't see an alternative whose effort is worth it.

llvm-svn: 150317