Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-03-04 00:20:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Shuffle VerifyDiagnosticsClient API to be less fragile.

Browse Source 
llvm-svn: 88765
This commit is contained in:
Daniel Dunbar 2009-11-14 07:53:24 +00:00
parent 409e890f8d
commit 1b39a2edff
3 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/include/clang/Frontend/VerifyDiagnosticsClient.h
View File

@ -48,11 +48,10 @@ class TextDiagnosticBuffer;
///
class VerifyDiagnosticsClient : public DiagnosticClient {
public:
Diagnostic &Diags;
llvm::OwningPtr<DiagnosticClient> PrimaryClient;
llvm::OwningPtr<TextDiagnosticBuffer> Buffer;
Preprocessor *CurrentPreprocessor;
Diagnostic *Diags;
SourceManager *SourceMgr;
bool NumErrors;
private:
@ -63,14 +62,14 @@ public:
/// PrimaryClient when a diagnostic does not match what is expected (as
/// indicated in the source file). The verifying diagnostic client takes
/// ownership of \arg PrimaryClient.
VerifyDiagnosticsClient(DiagnosticClient *PrimaryClient);
VerifyDiagnosticsClient(Diagnostic &Diags, DiagnosticClient *PrimaryClient);
~VerifyDiagnosticsClient();
virtual void BeginSourceFile(const LangOptions &LangOpts,
const Preprocessor *PP);
virtual void EndSourceFile();
virtual void HandleDiagnostic(Diagnostic::Level DiagLevel,
const DiagnosticInfo &Info);

8
clang/lib/Frontend/CompilerInstance.cpp
View File

@ -113,6 +113,8 @@ void CompilerInstance::createDiagnostics(int Argc, char **Argv) {
Diagnostic *CompilerInstance::createDiagnostics(const DiagnosticOptions &Opts,
int Argc, char **Argv) {
llvm::OwningPtr<Diagnostic> Diags(new Diagnostic());
// Create the diagnostic client for reporting errors or for
// implementing -verify.
llvm::OwningPtr<DiagnosticClient> DiagClient(
@ -120,17 +122,17 @@ Diagnostic *CompilerInstance::createDiagnostics(const DiagnosticOptions &Opts,
// Chain in -verify checker, if requested.
if (Opts.VerifyDiagnostics)
DiagClient.reset(new VerifyDiagnosticsClient(DiagClient.take()));
DiagClient.reset(new VerifyDiagnosticsClient(*Diags, DiagClient.take()));
if (!Opts.DumpBuildInformation.empty())
SetUpBuildDumpLog(Opts, Argc, Argv, DiagClient);
// Configure our handling of diagnostics.
Diagnostic *Diags = new Diagnostic(DiagClient.take());
Diags->setClient(DiagClient.take());
if (ProcessWarningOptions(*Diags, Opts))
return 0;
return Diags;
return Diags.take();
}
// File Manager

60
clang/lib/Frontend/VerifyDiagnosticsClient.cpp
View File

@ -19,9 +19,10 @@
#include "llvm/Support/raw_ostream.h"
using namespace clang;
VerifyDiagnosticsClient::VerifyDiagnosticsClient(DiagnosticClient *_Primary)
: PrimaryClient(_Primary), Buffer(new TextDiagnosticBuffer()),
CurrentPreprocessor(0), Diags(0), SourceMgr(0), NumErrors(0) {
VerifyDiagnosticsClient::VerifyDiagnosticsClient(Diagnostic &_Diags,
DiagnosticClient *_Primary)
: Diags(_Diags), PrimaryClient(_Primary),
Buffer(new TextDiagnosticBuffer()), CurrentPreprocessor(0), NumErrors(0) {
}
VerifyDiagnosticsClient::~VerifyDiagnosticsClient() {
@ -36,14 +37,6 @@ void VerifyDiagnosticsClient::BeginSourceFile(const LangOptions &LangOpts,
// because it doesn't get reused. It would be better if we could make a copy
// though.
CurrentPreprocessor = const_cast<Preprocessor*>(PP);
// FIXME: HACK. Remember the source manager, and just expect that its lifetime
// exceeds when we need it.
SourceMgr = PP ? &PP->getSourceManager() : 0;
// FIXME: HACK. Remember the diagnostic engine, and just expect that its
// lifetime exceeds when we need it.
Diags = PP ? &PP->getDiagnostics() : 0;
PrimaryClient->BeginSourceFile(LangOpts, PP);
}
@ -55,7 +48,7 @@ void VerifyDiagnosticsClient::EndSourceFile() {
CurrentPreprocessor = 0;
}
void VerifyDiagnosticsClient::HandleDiagnostic(Diagnostic::Level DiagLevel,
const DiagnosticInfo &Info) {
// Send the diagnostic to the buffer, we will check it once we reach the end
@ -209,7 +202,7 @@ static void FindExpectedDiags(Preprocessor &PP,
/// happened. Print the map out in a nice format and return "true". If the map
/// is empty and we're not going to print things, then return "false".
///
static unsigned PrintProblem(Diagnostic &Diags, SourceManager &SourceMgr,
static unsigned PrintProblem(Diagnostic &Diags, SourceManager *SourceMgr,
const_diag_iterator diag_begin,
const_diag_iterator diag_end,
const char *Kind, bool Expected) {
@ -218,15 +211,15 @@ static unsigned PrintProblem(Diagnostic &Diags, SourceManager &SourceMgr,
llvm::SmallString<256> Fmt;
llvm::raw_svector_ostream OS(Fmt);
for (const_diag_iterator I = diag_begin, E = diag_end; I != E; ++I) {
if (I->first.isInvalid())
if (I->first.isInvalid() || !SourceMgr)
OS << "\n (frontend)";
else
OS << "\n Line " << SourceMgr.getInstantiationLineNumber(I->first);
OS << "\n Line " << SourceMgr->getInstantiationLineNumber(I->first);
OS << ": " << I->second;
}
Diags.Report(diag::err_verify_inconsistent_diags)
<< Kind << Expected << OS.str();
<< Kind << !Expected << OS.str();
return std::distance(diag_begin, diag_end);
}
@ -269,10 +262,10 @@ static unsigned CompareDiagLists(Diagnostic &Diags,
}
// Now all that's left in Right are those that were not matched.
return (PrintProblem(Diags, SourceMgr,
LeftOnly.begin(), LeftOnly.end(), Label, false) +
PrintProblem(Diags, SourceMgr,
Right.begin(), Right.end(), Label, true));
return (PrintProblem(Diags, &SourceMgr,
LeftOnly.begin(), LeftOnly.end(), Label, true) +
PrintProblem(Diags, &SourceMgr,
Right.begin(), Right.end(), Label, false));
}
/// CheckResults - This compares the expected results to those that
@ -296,7 +289,7 @@ static unsigned CheckResults(Diagnostic &Diags, SourceManager &SourceMgr,
ExpectedErrors.begin(), ExpectedErrors.end(),
Buffer.err_begin(), Buffer.err_end(),
"error");
// See if there are warning mismatches.
NumProblems += CompareDiagLists(Diags, SourceMgr,
ExpectedWarnings.begin(),
@ -319,21 +312,32 @@ void VerifyDiagnosticsClient::CheckDiagnostics() {
DiagList ExpectedErrors, ExpectedWarnings, ExpectedNotes;
// Ensure any diagnostics go to the primary client.
DiagnosticClient *CurClient = Diags->getClient();
Diags->setClient(PrimaryClient.get());
DiagnosticClient *CurClient = Diags.getClient();
Diags.setClient(PrimaryClient.get());
// If we have a preprocessor, scan the source for expected diagnostic
// markers. If not then any diagnostics are unexpected.
if (CurrentPreprocessor) {
FindExpectedDiags(*CurrentPreprocessor, ExpectedErrors, ExpectedWarnings,
ExpectedNotes);
// Check that the expected diagnostics occurred.
NumErrors += CheckResults(Diags, CurrentPreprocessor->getSourceManager(),
*Buffer,
ExpectedErrors, ExpectedWarnings, ExpectedNotes);
} else {
NumErrors += (PrintProblem(Diags, 0,
Buffer->err_begin(), Buffer->err_end(),
"error", false) +
PrintProblem(Diags, 0,
Buffer->warn_begin(), Buffer->warn_end(),
"warn", false) +
PrintProblem(Diags, 0,
Buffer->note_begin(), Buffer->note_end(),
"note", false));
}
// Check that the expected diagnostics occurred.
NumErrors += CheckResults(*Diags, *SourceMgr, *Buffer,
ExpectedErrors, ExpectedWarnings, ExpectedNotes);
Diags->setClient(CurClient);
Diags.setClient(CurClient);
// Reset the buffer, we have processed all the diagnostics in it.
Buffer.reset(new TextDiagnosticBuffer());