Author: jlebar Date: Mon Oct 10 11:26:48 2016 New Revision: 283775 URL: http://llvm.org/viewvc/llvm-project?rev=283775&view=rev Log: [Analysis] Use unique_ptr for CallGraph::FunctionMap.
Reviewers: timshen Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D25427 Modified: cfe/trunk/include/clang/Analysis/CallGraph.h cfe/trunk/lib/Analysis/CallGraph.cpp Modified: cfe/trunk/include/clang/Analysis/CallGraph.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/CallGraph.h?rev=283775&r1=283774&r2=283775&view=diff ============================================================================== --- cfe/trunk/include/clang/Analysis/CallGraph.h (original) +++ cfe/trunk/include/clang/Analysis/CallGraph.h Mon Oct 10 11:26:48 2016 @@ -34,7 +34,8 @@ class CallGraphNode; class CallGraph : public RecursiveASTVisitor<CallGraph> { friend class CallGraphNode; - typedef llvm::DenseMap<const Decl *, CallGraphNode *> FunctionMapTy; + typedef llvm::DenseMap<const Decl *, std::unique_ptr<CallGraphNode>> + FunctionMapTy; /// FunctionMap owns all CallGraphNodes. FunctionMapTy FunctionMap; @@ -198,9 +199,11 @@ template <> struct GraphTraits<clang::Ca static NodeType *getEntryNode(clang::CallGraph *CGN) { return CGN->getRoot(); // Start at the external node! } - typedef std::pair<const clang::Decl*, clang::CallGraphNode*> PairTy; - static clang::CallGraphNode *CGGetValue(PairTy P) { return P.second; } + static clang::CallGraphNode * + CGGetValue(clang::CallGraph::const_iterator::value_type &P) { + return P.second.get(); + } // nodes_iterator/begin/end - Allow iteration over all nodes in the graph typedef mapped_iterator<clang::CallGraph::iterator, decltype(&CGGetValue)> @@ -223,9 +226,11 @@ template <> struct GraphTraits<const cla static NodeType *getEntryNode(const clang::CallGraph *CGN) { return CGN->getRoot(); } - typedef std::pair<const clang::Decl*, clang::CallGraphNode*> PairTy; - static clang::CallGraphNode *CGGetValue(PairTy P) { return P.second; } + static clang::CallGraphNode * + CGGetValue(clang::CallGraph::const_iterator::value_type &P) { + return P.second.get(); + } // nodes_iterator/begin/end - Allow iteration over all nodes in the graph typedef mapped_iterator<clang::CallGraph::const_iterator, Modified: cfe/trunk/lib/Analysis/CallGraph.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CallGraph.cpp?rev=283775&r1=283774&r2=283775&view=diff ============================================================================== --- cfe/trunk/lib/Analysis/CallGraph.cpp (original) +++ cfe/trunk/lib/Analysis/CallGraph.cpp Mon Oct 10 11:26:48 2016 @@ -104,9 +104,7 @@ CallGraph::CallGraph() { Root = getOrInsertNode(nullptr); } -CallGraph::~CallGraph() { - llvm::DeleteContainerSeconds(FunctionMap); -} +CallGraph::~CallGraph() {} bool CallGraph::includeInGraph(const Decl *D) { assert(D); @@ -142,22 +140,22 @@ void CallGraph::addNodeForDecl(Decl* D, CallGraphNode *CallGraph::getNode(const Decl *F) const { FunctionMapTy::const_iterator I = FunctionMap.find(F); if (I == FunctionMap.end()) return nullptr; - return I->second; + return I->second.get(); } CallGraphNode *CallGraph::getOrInsertNode(Decl *F) { if (F && !isa<ObjCMethodDecl>(F)) F = F->getCanonicalDecl(); - CallGraphNode *&Node = FunctionMap[F]; + std::unique_ptr<CallGraphNode> &Node = FunctionMap[F]; if (Node) - return Node; + return Node.get(); - Node = new CallGraphNode(F); + Node = llvm::make_unique<CallGraphNode>(F); // Make Root node a parent of all functions to make sure all are reachable. if (F) - Root->addCallee(Node, this); - return Node; + Root->addCallee(Node.get(), this); + return Node.get(); } void CallGraph::print(raw_ostream &OS) const { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
