replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[analyzer][UninitializedObjectChecker] Using the new const methods of ImmutableList 

Differential Revision: https://reviews.llvm.org/D51886

llvm-svn: 342834
This commit is contained in:
Kristof Umann 2018-09-23 09:16:27 +00:00
parent b2de4b39be
commit 82eeca363a
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObject.h
View File

@ -152,7 +152,6 @@ std::string getVariableName(const FieldDecl *Field);
/// functions such as add() and replaceHead().
class FieldChainInfo {
public:
using FieldChainImpl = llvm::ImmutableListImpl<const FieldNode &>;
using FieldChain = llvm::ImmutableList<const FieldNode &>;
private:
@ -179,8 +178,8 @@ public:
bool contains(const FieldRegion *FR) const;
bool isEmpty() const { return Chain.isEmpty(); }
const FieldRegion *getUninitRegion() const;
const FieldNode &getHead() { return Chain.getHead(); }
const FieldNode &getHead() const { return Chain.getHead(); }
const FieldRegion *getUninitRegion() const { return getHead().getRegion(); }
void printNoteMsg(llvm::raw_ostream &Out) const;
};

25
clang/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp
View File

@ -339,14 +339,6 @@ bool FindUninitializedFields::isPrimitiveUninit(const SVal &V) {
// Methods for FieldChainInfo.
//===----------------------------------------------------------------------===//
const FieldRegion *FieldChainInfo::getUninitRegion() const {
assert(!Chain.isEmpty() && "Empty fieldchain!");
// ImmutableList::getHead() isn't a const method, hence the not too nice
// implementation.
return (*Chain.begin()).getRegion();
}
bool FieldChainInfo::contains(const FieldRegion *FR) const {
for (const FieldNode &Node : Chain) {
if (Node.isSameRegion(FR))
@ -360,7 +352,7 @@ bool FieldChainInfo::contains(const FieldRegion *FR) const {
/// recursive function to print the fieldchain correctly. The last element in
/// the chain is to be printed by `FieldChainInfo::print`.
static void printTail(llvm::raw_ostream &Out,
const FieldChainInfo::FieldChainImpl *L);
const FieldChainInfo::FieldChain L);
// FIXME: This function constructs an incorrect string in the following case:
//
@ -379,8 +371,7 @@ void FieldChainInfo::printNoteMsg(llvm::raw_ostream &Out) const {
if (Chain.isEmpty())
return;
const FieldChainImpl *L = Chain.getInternalPointer();
const FieldNode &LastField = L->getHead();
const FieldNode &LastField = getHead();
LastField.printNoteMsg(Out);
Out << '\'';
@ -389,20 +380,20 @@ void FieldChainInfo::printNoteMsg(llvm::raw_ostream &Out) const {
Node.printPrefix(Out);
Out << "this->";
printTail(Out, L->getTail());
printTail(Out, Chain.getTail());
LastField.printNode(Out);
Out << '\'';
}
static void printTail(llvm::raw_ostream &Out,
const FieldChainInfo::FieldChainImpl *L) {
if (!L)
const FieldChainInfo::FieldChain L) {
if (L.isEmpty())
return;
printTail(Out, L->getTail());
printTail(Out, L.getTail());
L->getHead().printNode(Out);
L->getHead().printSeparator(Out);
L.getHead().printNode(Out);
L.getHead().printSeparator(Out);
}
//===----------------------------------------------------------------------===//