I'd prefer for the diagnostic-skipping and diagnostic-producing code to be a bit more closely linked together (maybe just extend the comment to point out where the diagnostic is produced), but this looks fine. http://llvm-reviews.chandlerc.com/D2375