Author: george.karpenkov Date: Tue Oct 31 18:36:01 2017 New Revision: 317065
URL: http://llvm.org/viewvc/llvm-project?rev=317065&view=rev Log: [Analyzer] Use value storage for BodyFarm Differential Revision: https://reviews.llvm.org/D39428 Modified: cfe/trunk/include/clang/Analysis/AnalysisDeclContext.h cfe/trunk/include/clang/Analysis/BodyFarm.h cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp Modified: cfe/trunk/include/clang/Analysis/AnalysisDeclContext.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/AnalysisDeclContext.h?rev=317065&r1=317064&r2=317065&view=diff ============================================================================== --- cfe/trunk/include/clang/Analysis/AnalysisDeclContext.h (original) +++ cfe/trunk/include/clang/Analysis/AnalysisDeclContext.h Tue Oct 31 18:36:01 2017 @@ -419,9 +419,9 @@ class AnalysisDeclContextManager { /// declarations from external source. std::unique_ptr<CodeInjector> Injector; - /// Pointer to a factory for creating and caching implementations for common + /// A factory for creating and caching implementations for common /// methods during the analysis. - std::unique_ptr<BodyFarm> FunctionBodyFarm; + BodyFarm FunctionBodyFarm; /// Flag to indicate whether or not bodies should be synthesized /// for well-known functions. @@ -475,8 +475,8 @@ public: return LocContexts.getStackFrame(getContext(D), Parent, S, Blk, Idx); } - /// Get and lazily create a {@code BodyFarm} instance. - BodyFarm *getBodyFarm(); + /// Get a reference to {@code BodyFarm} instance. + BodyFarm &getBodyFarm(); /// Discard all previously created AnalysisDeclContexts. void clear(); Modified: cfe/trunk/include/clang/Analysis/BodyFarm.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/BodyFarm.h?rev=317065&r1=317064&r2=317065&view=diff ============================================================================== --- cfe/trunk/include/clang/Analysis/BodyFarm.h (original) +++ cfe/trunk/include/clang/Analysis/BodyFarm.h Tue Oct 31 18:36:01 2017 @@ -39,6 +39,9 @@ public: /// Factory method for creating bodies for Objective-C properties. Stmt *getBody(const ObjCMethodDecl *D); + /// Remove copy constructor to avoid accidental copying. + BodyFarm(const BodyFarm &other) = delete; + private: typedef llvm::DenseMap<const Decl *, Optional<Stmt *>> BodyMap; Modified: cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp?rev=317065&r1=317064&r2=317065&view=diff ============================================================================== --- cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp (original) +++ cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp Tue Oct 31 18:36:01 2017 @@ -68,7 +68,8 @@ AnalysisDeclContextManager::AnalysisDecl bool addInitializers, bool addTemporaryDtors, bool addLifetime, bool addLoopExit, bool synthesizeBodies, bool addStaticInitBranch, bool addCXXNewAllocator, CodeInjector *injector) - : ASTCtx(ASTCtx), Injector(injector), SynthesizeBodies(synthesizeBodies) { + : ASTCtx(ASTCtx), Injector(injector), FunctionBodyFarm(ASTCtx, injector), + SynthesizeBodies(synthesizeBodies) { cfgBuildOptions.PruneTriviallyFalseEdges = !useUnoptimizedCFG; cfgBuildOptions.AddImplicitDtors = addImplicitDtors; cfgBuildOptions.AddInitializers = addInitializers; @@ -88,7 +89,7 @@ Stmt *AnalysisDeclContext::getBody(bool if (auto *CoroBody = dyn_cast_or_null<CoroutineBodyStmt>(Body)) Body = CoroBody->getBody(); if (Manager && Manager->synthesizeBodies()) { - Stmt *SynthesizedBody = Manager->getBodyFarm()->getBody(FD); + Stmt *SynthesizedBody = Manager->getBodyFarm().getBody(FD); if (SynthesizedBody) { Body = SynthesizedBody; IsAutosynthesized = true; @@ -99,7 +100,7 @@ Stmt *AnalysisDeclContext::getBody(bool else if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(D)) { Stmt *Body = MD->getBody(); if (Manager && Manager->synthesizeBodies()) { - Stmt *SynthesizedBody = Manager->getBodyFarm()->getBody(MD); + Stmt *SynthesizedBody = Manager->getBodyFarm().getBody(MD); if (SynthesizedBody) { Body = SynthesizedBody; IsAutosynthesized = true; @@ -304,11 +305,7 @@ AnalysisDeclContext *AnalysisDeclContext return AC.get(); } -BodyFarm *AnalysisDeclContextManager::getBodyFarm() { - if (!FunctionBodyFarm) - FunctionBodyFarm = llvm::make_unique<BodyFarm>(ASTCtx, Injector.get()); - return FunctionBodyFarm.get(); -} +BodyFarm &AnalysisDeclContextManager::getBodyFarm() { return FunctionBodyFarm; } const StackFrameContext * AnalysisDeclContext::getStackFrame(LocationContext const *Parent, const Stmt *S, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
