cc0b1bfa56
PathDiagnostics are actually profiled and uniqued independently of the path on which the bug occurred. This is used to merge diagnostics that refer to the same issue along different paths, as well as by the plist diagnostics to reference files created by the HTML diagnostics. However, there are two problems with the current implementation: 1) The bug description is included in the profile, but some PathDiagnosticConsumers prefer abbreviated descriptions and some prefer verbose descriptions. Fixed by including both descriptions in the PathDiagnostic objects and always using the verbose one in the profile. 2) The "minimal" path generation scheme provides extra information about which events came from macros that the "extensive" scheme does not. This resulted not only in different locations for the plist and HTML diagnostics, but also in diagnostics being uniqued in the plist output but not in the HTML output. Fixed by storing the "end path" location explicitly in the PathDiagnostic object, rather than trying to find the last piece of the path when the diagnostic is requested. This should hopefully finish unsticking our internal buildbot. llvm-svn: 162965
72 lines
2.6 KiB
C++
72 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 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);
|
|
}
|
|
}
|
|
}
|