Author: jlebar Date: Mon Oct 10 11:26:44 2016 New Revision: 283774 URL: http://llvm.org/viewvc/llvm-project?rev=283774&view=rev Log: [Analysis] Use unique_ptr in AnalyaisDeclContextManager's ContextMap.
Reviewers: timshen Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D25426 Modified: cfe/trunk/include/clang/Analysis/AnalysisContext.h cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp Modified: cfe/trunk/include/clang/Analysis/AnalysisContext.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/AnalysisContext.h?rev=283774&r1=283773&r2=283774&view=diff ============================================================================== --- cfe/trunk/include/clang/Analysis/AnalysisContext.h (original) +++ cfe/trunk/include/clang/Analysis/AnalysisContext.h Mon Oct 10 11:26:44 2016 @@ -406,7 +406,8 @@ private: }; class AnalysisDeclContextManager { - typedef llvm::DenseMap<const Decl*, AnalysisDeclContext*> ContextMap; + typedef llvm::DenseMap<const Decl *, std::unique_ptr<AnalysisDeclContext>> + ContextMap; ContextMap Contexts; LocationContextManager LocContexts; Modified: cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp?rev=283774&r1=283773&r2=283774&view=diff ============================================================================== --- cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp (original) +++ cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp Mon Oct 10 11:26:44 2016 @@ -81,9 +81,7 @@ AnalysisDeclContextManager::AnalysisDecl cfgBuildOptions.AddCXXNewAllocator = addCXXNewAllocator; } -void AnalysisDeclContextManager::clear() { - llvm::DeleteContainerSeconds(Contexts); -} +void AnalysisDeclContextManager::clear() { Contexts.clear(); } static BodyFarm &getBodyFarm(ASTContext &C, CodeInjector *injector = nullptr) { static BodyFarm *BF = new BodyFarm(C, injector); @@ -307,10 +305,10 @@ AnalysisDeclContext *AnalysisDeclContext D = FD; } - AnalysisDeclContext *&AC = Contexts[D]; + std::unique_ptr<AnalysisDeclContext> &AC = Contexts[D]; if (!AC) - AC = new AnalysisDeclContext(this, D, cfgBuildOptions); - return AC; + AC = llvm::make_unique<AnalysisDeclContext>(this, D, cfgBuildOptions); + return AC.get(); } const StackFrameContext * @@ -606,9 +604,7 @@ AnalysisDeclContext::~AnalysisDeclContex } } -AnalysisDeclContextManager::~AnalysisDeclContextManager() { - llvm::DeleteContainerSeconds(Contexts); -} +AnalysisDeclContextManager::~AnalysisDeclContextManager() {} LocationContext::~LocationContext() {} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
