9bf9af92a4
This fixes several issues: - removes egregious hack where PlistDiagnosticConsumer would forward to HTMLDiagnosticConsumer, but diagnostics wouldn't be generated consistently in the same way if PlistDiagnosticConsumer was used by itself. - emitting diagnostics to the terminal (using clang's diagnostic machinery) is no longer a special case, just another PathDiagnosticConsumer. This also magically resolved some duplicate warnings, as we now use PathDiagnosticConsumer's diagnostic pruning, which has scope for the entire translation unit, not just the scope of a BugReporter (which is limited to a particular ExprEngine). As an interesting side-effect, diagnostics emitted to the terminal also have their trailing "." stripped, just like with diagnostics emitted to plists and HTML. This required some tests to be updated, but now the tests have higher fidelity with what users will see. There are some inefficiencies in this patch. We currently generate the report graph (from the ExplodedGraph) once per PathDiagnosticConsumer, which is a bit wasteful, but that could be pulled up higher in the logic stack. There is some intended duplication, however, as we now generate different PathDiagnostics (for the same issue) for different PathDiagnosticConsumers. This is necessary to produce the diagnostics that a particular consumer expects. llvm-svn: 162028
73 lines
2.6 KiB
C++
73 lines
2.6 KiB
C++
//===--- TextPathDiagnostics.cpp - Text Diagnostics for Paths ---*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file defines the TextPathDiagnostics object.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h"
|
|
#include "clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h"
|
|
#include "clang/Lex/Preprocessor.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
using namespace clang;
|
|
using namespace ento;
|
|
using namespace llvm;
|
|
|
|
namespace {
|
|
|
|
/// \brief Simple path diagnostic client used for outputting as diagnostic notes
|
|
/// the sequence of events.
|
|
class TextPathDiagnostics : public PathDiagnosticConsumer {
|
|
const std::string OutputFile;
|
|
DiagnosticsEngine &Diag;
|
|
|
|
public:
|
|
TextPathDiagnostics(const std::string& output, DiagnosticsEngine &diag)
|
|
: OutputFile(output), Diag(diag) {}
|
|
|
|
void FlushDiagnosticsImpl(std::vector<const PathDiagnostic *> &Diags,
|
|
FilesMade *filesMade);
|
|
|
|
virtual StringRef getName() const {
|
|
return "TextPathDiagnostics";
|
|
}
|
|
|
|
PathGenerationScheme getGenerationScheme() const { return Minimal; }
|
|
bool supportsLogicalOpControlFlow() const { return true; }
|
|
bool supportsAllBlockEdges() const { return true; }
|
|
virtual bool useVerboseDescription() const { return true; }
|
|
virtual bool supportsCrossFileDiagnostics() const { return true; }
|
|
};
|
|
|
|
} // end anonymous namespace
|
|
|
|
void ento::createTextPathDiagnosticConsumer(PathDiagnosticConsumers &C,
|
|
const std::string& out,
|
|
const Preprocessor &PP) {
|
|
C.push_back(new TextPathDiagnostics(out, PP.getDiagnostics()));
|
|
}
|
|
|
|
void TextPathDiagnostics::FlushDiagnosticsImpl(
|
|
std::vector<const PathDiagnostic *> &Diags,
|
|
FilesMade *) {
|
|
for (std::vector<const PathDiagnostic *>::iterator it = Diags.begin(),
|
|
et = Diags.end(); it != et; ++it) {
|
|
const PathDiagnostic *D = *it;
|
|
|
|
PathPieces FlatPath = D->path.flatten(/*ShouldFlattenMacros=*/true);
|
|
for (PathPieces::const_iterator I = FlatPath.begin(), E = FlatPath.end();
|
|
I != E; ++I) {
|
|
unsigned diagID =
|
|
Diag.getDiagnosticIDs()->getCustomDiagID(DiagnosticIDs::Note,
|
|
(*I)->getString());
|
|
Diag.Report((*I)->getLocation().asLocation(), diagID);
|
|
}
|
|
}
|
|
}
|