diff options
Diffstat (limited to 'clang/lib/Frontend/VerifyDiagnosticConsumer.cpp')
| -rw-r--r-- | clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 91 |
1 files changed, 56 insertions, 35 deletions
diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp index 82c2af87706e..56e05242f7c9 100644 --- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp +++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp @@ -89,9 +89,10 @@ namespace { class StandardDirective : public Directive { public: StandardDirective(SourceLocation DirectiveLoc, SourceLocation DiagnosticLoc, - bool MatchAnyLine, StringRef Text, unsigned Min, - unsigned Max) - : Directive(DirectiveLoc, DiagnosticLoc, MatchAnyLine, Text, Min, Max) {} + bool MatchAnyFileAndLine, bool MatchAnyLine, StringRef Text, + unsigned Min, unsigned Max) + : Directive(DirectiveLoc, DiagnosticLoc, MatchAnyFileAndLine, + MatchAnyLine, Text, Min, Max) {} bool isValid(std::string &Error) override { // all strings are considered valid; even empty ones @@ -107,9 +108,10 @@ public: class RegexDirective : public Directive { public: RegexDirective(SourceLocation DirectiveLoc, SourceLocation DiagnosticLoc, - bool MatchAnyLine, StringRef Text, unsigned Min, unsigned Max, - StringRef RegexStr) - : Directive(DirectiveLoc, DiagnosticLoc, MatchAnyLine, Text, Min, Max), + bool MatchAnyFileAndLine, bool MatchAnyLine, StringRef Text, + unsigned Min, unsigned Max, StringRef RegexStr) + : Directive(DirectiveLoc, DiagnosticLoc, MatchAnyFileAndLine, + MatchAnyLine, Text, Min, Max), Regex(RegexStr) {} bool isValid(std::string &Error) override { @@ -294,11 +296,13 @@ struct UnattachedDirective { // Attach the specified directive to the line of code indicated by // \p ExpectedLoc. void attachDirective(DiagnosticsEngine &Diags, const UnattachedDirective &UD, - SourceLocation ExpectedLoc, bool MatchAnyLine = false) { + SourceLocation ExpectedLoc, + bool MatchAnyFileAndLine = false, + bool MatchAnyLine = false) { // Construct new directive. - std::unique_ptr<Directive> D = - Directive::create(UD.RegexKind, UD.DirectivePos, ExpectedLoc, - MatchAnyLine, UD.Text, UD.Min, UD.Max); + std::unique_ptr<Directive> D = Directive::create( + UD.RegexKind, UD.DirectivePos, ExpectedLoc, MatchAnyFileAndLine, + MatchAnyLine, UD.Text, UD.Min, UD.Max); std::string Error; if (!D->isValid(Error)) { @@ -498,6 +502,7 @@ static bool ParseDirective(StringRef S, ExpectedData *ED, SourceManager &SM, // Next optional token: @ SourceLocation ExpectedLoc; StringRef Marker; + bool MatchAnyFileAndLine = false; bool MatchAnyLine = false; if (!PH.Next("@")) { ExpectedLoc = Pos; @@ -526,26 +531,39 @@ static bool ParseDirective(StringRef S, ExpectedData *ED, SourceManager &SM, StringRef Filename(PH.C, PH.P-PH.C); PH.Advance(); - // Lookup file via Preprocessor, like a #include. - const DirectoryLookup *CurDir; - Optional<FileEntryRef> File = - PP->LookupFile(Pos, Filename, false, nullptr, nullptr, CurDir, - nullptr, nullptr, nullptr, nullptr, nullptr); - if (!File) { - Diags.Report(Pos.getLocWithOffset(PH.C-PH.Begin), - diag::err_verify_missing_file) << Filename << KindStr; - continue; - } - - const FileEntry *FE = &File->getFileEntry(); - if (SM.translateFile(FE).isInvalid()) - SM.createFileID(FE, Pos, SrcMgr::C_User); - - if (PH.Next(Line) && Line > 0) - ExpectedLoc = SM.translateFileLineCol(FE, Line, 1); - else if (PH.Next("*")) { + if (Filename == "*") { + MatchAnyFileAndLine = true; + if (!PH.Next("*")) { + Diags.Report(Pos.getLocWithOffset(PH.C - PH.Begin), + diag::err_verify_missing_line) + << "'*'"; + continue; + } MatchAnyLine = true; - ExpectedLoc = SM.translateFileLineCol(FE, 1, 1); + ExpectedLoc = SourceLocation(); + } else { + // Lookup file via Preprocessor, like a #include. + const DirectoryLookup *CurDir; + Optional<FileEntryRef> File = + PP->LookupFile(Pos, Filename, false, nullptr, nullptr, CurDir, + nullptr, nullptr, nullptr, nullptr, nullptr); + if (!File) { + Diags.Report(Pos.getLocWithOffset(PH.C - PH.Begin), + diag::err_verify_missing_file) + << Filename << KindStr; + continue; + } + + const FileEntry *FE = &File->getFileEntry(); + if (SM.translateFile(FE).isInvalid()) + SM.createFileID(FE, Pos, SrcMgr::C_User); + + if (PH.Next(Line) && Line > 0) + ExpectedLoc = SM.translateFileLineCol(FE, Line, 1); + else if (PH.Next("*")) { + MatchAnyLine = true; + ExpectedLoc = SM.translateFileLineCol(FE, 1, 1); + } } } else if (PH.Next("*")) { MatchAnyLine = true; @@ -631,7 +649,7 @@ static bool ParseDirective(StringRef S, ExpectedData *ED, SourceManager &SM, } if (Marker.empty()) - attachDirective(Diags, D, ExpectedLoc, MatchAnyLine); + attachDirective(Diags, D, ExpectedLoc, MatchAnyFileAndLine, MatchAnyLine); else Markers.addDirective(Marker, D); FoundDirective = true; @@ -877,7 +895,7 @@ static unsigned PrintExpected(DiagnosticsEngine &Diags, SmallString<256> Fmt; llvm::raw_svector_ostream OS(Fmt); for (const auto *D : DL) { - if (D->DiagnosticLoc.isInvalid()) + if (D->DiagnosticLoc.isInvalid() || D->MatchAnyFileAndLine) OS << "\n File *"; else OS << "\n File " << SourceMgr.getFilename(D->DiagnosticLoc); @@ -937,7 +955,7 @@ static unsigned CheckLists(DiagnosticsEngine &Diags, SourceManager &SourceMgr, continue; } - if (!D.DiagnosticLoc.isInvalid() && + if (!D.DiagnosticLoc.isInvalid() && !D.MatchAnyFileAndLine && !IsFromSameFile(SourceMgr, D.DiagnosticLoc, II->first)) continue; @@ -1114,11 +1132,13 @@ void VerifyDiagnosticConsumer::CheckDiagnostics() { std::unique_ptr<Directive> Directive::create(bool RegexKind, SourceLocation DirectiveLoc, SourceLocation DiagnosticLoc, + bool MatchAnyFileAndLine, bool MatchAnyLine, StringRef Text, unsigned Min, unsigned Max) { if (!RegexKind) return std::make_unique<StandardDirective>(DirectiveLoc, DiagnosticLoc, - MatchAnyLine, Text, Min, Max); + MatchAnyFileAndLine, + MatchAnyLine, Text, Min, Max); // Parse the directive into a regular expression. std::string RegexStr; @@ -1143,6 +1163,7 @@ std::unique_ptr<Directive> Directive::create(bool RegexKind, } } - return std::make_unique<RegexDirective>( - DirectiveLoc, DiagnosticLoc, MatchAnyLine, Text, Min, Max, RegexStr); + return std::make_unique<RegexDirective>(DirectiveLoc, DiagnosticLoc, + MatchAnyFileAndLine, MatchAnyLine, + Text, Min, Max, RegexStr); } |