Change -verify mode to find the "expected-error" and "expected-warning" strings
with a raw lexer instead of a PP lexer. This means that -verify doesn't scan
#include'd headers for expected-error/warning strings, and it also means that it
doesn't ignore them in #if 0.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59774 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/DiagChecker.cpp b/Driver/DiagChecker.cpp
index c474951..d6321d6 100644
--- a/Driver/DiagChecker.cpp
+++ b/Driver/DiagChecker.cpp
@@ -93,28 +93,29 @@
DiagList &ExpectedErrors,
DiagList &ExpectedWarnings,
DiagList &ExpectedNotes) {
- // Return comments as tokens, this is how we find expected diagnostics.
- PP.SetCommentRetentionState(true, true);
-
- // Enter the cave.
- PP.EnterMainSourceFile();
-
- // Turn off all warnings from relexing or preprocessing.
- PP.getDiagnostics().setWarnOnExtensions(false);
- PP.getDiagnostics().setErrorOnExtensions(false);
- for (unsigned i = 0; i != diag::NUM_BUILTIN_DIAGNOSTICS; ++i)
- if (PP.getDiagnostics().isBuiltinNoteWarningOrExtension((diag::kind)i))
- PP.getDiagnostics().setDiagnosticMapping((diag::kind)i, diag::MAP_IGNORE);
+ // Create a raw lexer to pull all the comments out of the main file. We don't
+ // want to look in #include'd headers for expected-error strings.
+ unsigned FileID = PP.getSourceManager().getMainFileID();
+ std::pair<const char*,const char*> File =
+ PP.getSourceManager().getBufferData(FileID);
+
+ // Create a lexer to lex all the tokens of the main file in raw mode.
+ Lexer RawLex(SourceLocation::getFileLoc(FileID, 0),
+ PP.getLangOptions(), File.first, File.second);
+
+ // Return comments as tokens, this is how we find expected diagnostics.
+ RawLex.SetCommentRetentionState(true);
+
Token Tok;
do {
- PP.Lex(Tok);
+ RawLex.Lex(Tok);
if (Tok.is(tok::comment)) {
std::string Comment = PP.getSpelling(Tok);
// Find all expected errors
- FindDiagnostics(Comment, ExpectedErrors,PP.getSourceManager(),
+ FindDiagnostics(Comment, ExpectedErrors, PP.getSourceManager(),
Tok.getLocation(), ExpectedErrStr);
// Find all expected warnings
@@ -126,8 +127,6 @@
Tok.getLocation(), ExpectedNoteStr);
}
} while (Tok.isNot(tok::eof));
-
- PP.SetCommentRetentionState(false, false);
}
/// PrintProblem - This takes a diagnostic map of the delta between expected and