From 17ad3ac2aacf3c38cc60c914736bd71d67eaad83 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 18 Oct 2017 01:41:38 +0000 Subject: [modules] When finding the owning module of an instantiated context in template instantiation, follow lexical parents not semantic ones: we want to find the module where the pattern was written. llvm-svn: 316055 --- clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'clang/lib/Frontend') diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp index 427d15ed703..a49c424e915 100644 --- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp +++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp @@ -416,9 +416,12 @@ static bool ParseDirective(StringRef S, ExpectedData *ED, SourceManager &SM, MatchAnyLine = true; ExpectedLoc = SM.translateFileLineCol(FE, 1, 1); } + } else if (PH.Next("*")) { + MatchAnyLine = true; + ExpectedLoc = SourceLocation(); } - if (ExpectedLoc.isInvalid()) { + if (ExpectedLoc.isInvalid() && !MatchAnyLine) { Diags.Report(Pos.getLocWithOffset(PH.C-PH.Begin), diag::err_verify_missing_line) << KindStr; continue; @@ -650,7 +653,10 @@ static unsigned PrintExpected(DiagnosticsEngine &Diags, llvm::raw_svector_ostream OS(Fmt); for (auto *DirPtr : DL) { Directive &D = *DirPtr; - OS << "\n File " << SourceMgr.getFilename(D.DiagnosticLoc); + if (D.DiagnosticLoc.isInvalid()) + OS << "\n File *"; + else + OS << "\n File " << SourceMgr.getFilename(D.DiagnosticLoc); if (D.MatchAnyLine) OS << " Line *"; else @@ -708,7 +714,8 @@ static unsigned CheckLists(DiagnosticsEngine &Diags, SourceManager &SourceMgr, continue; } - if (!IsFromSameFile(SourceMgr, D.DiagnosticLoc, II->first)) + if (!D.DiagnosticLoc.isInvalid() && + !IsFromSameFile(SourceMgr, D.DiagnosticLoc, II->first)) continue; const std::string &RightText = II->second; -- cgit v1.2.3