maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix regression: initialize 'size' for PathDiagnostic to 0. 

Add some assertions along the way...

llvm-svn: 66265
This commit is contained in:
Ted Kremenek 2009-03-06 07:53:30 +00:00
parent e41a434f89
commit 55f46f6aab
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/include/clang/Analysis/PathDiagnostic.h
View File

@ -37,8 +37,12 @@ private:
const DisplayHint Hint;
std::vector<SourceRange> ranges;
public:
// Do not implement:
PathDiagnosticPiece();
PathDiagnosticPiece(const PathDiagnosticPiece &P);
PathDiagnosticPiece& operator=(const PathDiagnosticPiece &P);
public:
PathDiagnosticPiece(FullSourceLoc pos, const std::string& s,
Kind k = Event,
DisplayHint hint = Above);
@ -98,10 +102,10 @@ class PathDiagnostic {
std::string Desc;
std::string Category;
std::vector<std::string> OtherDesc;
public:
PathDiagnostic() : Size(0) {}
PathDiagnostic();
PathDiagnostic(const char* bugtype, const char* desc, const char* category);
PathDiagnostic(const std::string& bugtype, const std::string& desc,

18
clang/lib/Analysis/PathDiagnostic.cpp
View File

@ -36,12 +36,20 @@ static inline size_t GetNumCharsToLastNonPeriod(const std::string &s) {
PathDiagnosticPiece::PathDiagnosticPiece(FullSourceLoc pos,
const std::string& s,
Kind k, DisplayHint hint)
: Pos(pos), str(s, 0, GetNumCharsToLastNonPeriod(s)), kind(k), Hint(hint) {}
: Pos(pos), str(s, 0, GetNumCharsToLastNonPeriod(s)), kind(k), Hint(hint) {
assert(Pos.isValid() &&
"PathDiagnosticPiece's must have a valid location.");
}
PathDiagnosticPiece::PathDiagnosticPiece(FullSourceLoc pos,
const char* s, Kind k,
DisplayHint hint)
: Pos(pos), str(s, GetNumCharsToLastNonPeriod(s)), kind(k), Hint(hint) {}
: Pos(pos), str(s, GetNumCharsToLastNonPeriod(s)), kind(k), Hint(hint) {
assert(Pos.isValid() &&
"PathDiagnosticPiece's must have a valid location.");
}
PathDiagnostic::PathDiagnostic() : Size(0) {}
PathDiagnostic::~PathDiagnostic() {
for (iterator I = begin(), E = end(); I != E; ++I) delete &*I;
@ -50,14 +58,16 @@ PathDiagnostic::~PathDiagnostic() {
PathDiagnostic::PathDiagnostic(const char* bugtype, const char* desc,
const char* category)
: BugType(bugtype, GetNumCharsToLastNonPeriod(bugtype)),
: Size(0),
BugType(bugtype, GetNumCharsToLastNonPeriod(bugtype)),
Desc(desc, GetNumCharsToLastNonPeriod(desc)),
Category(category, GetNumCharsToLastNonPeriod(category)) {}
PathDiagnostic::PathDiagnostic(const std::string& bugtype,
const std::string& desc,
const std::string& category)
: BugType(bugtype, 0, GetNumCharsToLastNonPeriod(bugtype)),
: Size(0),
BugType(bugtype, 0, GetNumCharsToLastNonPeriod(bugtype)),
Desc(desc, 0, GetNumCharsToLastNonPeriod(desc)),
Category(category, 0, GetNumCharsToLastNonPeriod(category)) {}