Author: dergachev Date: Mon Mar 12 16:27:52 2018 New Revision: 327347 URL: http://llvm.org/viewvc/llvm-project?rev=327347&view=rev Log: [analyzer] NFC: Move the code for setting temp object lifetime into method.
Differential Revision: https://reviews.llvm.org/D44129 Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h?rev=327347&r1=327346&r2=327347&view=diff ============================================================================== --- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h (original) +++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h Mon Mar 12 16:27:52 2018 @@ -774,6 +774,14 @@ private: const LocationContext *FromLC, const LocationContext *ToLC); + /// Adds an initialized temporary and/or a materialization, whichever is + /// necessary, by looking at the whole construction context. Handles + /// function return values, which need the construction context of the parent + /// stack frame, automagically. + ProgramStateRef addAllNecessaryTemporaryInfo( + ProgramStateRef State, const ConstructionContext *CC, + const LocationContext *LC, const MemRegion *R); + /// Store the region returned by operator new() so that the constructor /// that follows it knew what location to initialize. The value should be /// cleared once the respective CXXNewExpr CFGStmt element is processed. Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp?rev=327347&r1=327346&r2=327347&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp Mon Mar 12 16:27:52 2018 @@ -31,6 +31,7 @@ #include "clang/AST/Type.h" #include "clang/Analysis/AnalysisDeclContext.h" #include "clang/Analysis/CFG.h" +#include "clang/Analysis/ConstructionContext.h" #include "clang/Analysis/ProgramPoint.h" #include "clang/Basic/IdentifierTable.h" #include "clang/Basic/LLVM.h" @@ -449,6 +450,65 @@ bool ExprEngine::areTemporaryMaterializa return true; } +ProgramStateRef ExprEngine::addAllNecessaryTemporaryInfo( + ProgramStateRef State, const ConstructionContext *CC, + const LocationContext *LC, const MemRegion *R) { + const CXXBindTemporaryExpr *BTE = nullptr; + const MaterializeTemporaryExpr *MTE = nullptr; + const LocationContext *TempLC = LC; + + if (CC) { + // In case of temporary object construction, extract data necessary for + // destruction and lifetime extension. + const auto *TCC = dyn_cast<TemporaryObjectConstructionContext>(CC); + + // If the temporary is being returned from the function, it will be + // destroyed or lifetime-extended in the caller stack frame. + if (const auto *RCC = dyn_cast<ReturnedValueConstructionContext>(CC)) { + const StackFrameContext *SFC = LC->getCurrentStackFrame(); + assert(SFC); + if (SFC->getParent()) { + TempLC = SFC->getParent(); + const CFGElement &CallElem = + (*SFC->getCallSiteBlock())[SFC->getIndex()]; + if (auto RTCElem = CallElem.getAs<CFGCXXRecordTypedCall>()) { + TCC = cast<TemporaryObjectConstructionContext>( + RTCElem->getConstructionContext()); + } + } + } + if (TCC) { + if (AMgr.getAnalyzerOptions().includeTemporaryDtorsInCFG()) { + BTE = TCC->getCXXBindTemporaryExpr(); + MTE = TCC->getMaterializedTemporaryExpr(); + if (!BTE) { + // FIXME: Lifetime extension for temporaries without destructors + // is not implemented yet. + MTE = nullptr; + } + if (MTE && MTE->getStorageDuration() != SD_FullExpression) { + // If the temporary is lifetime-extended, don't save the BTE, + // because we don't need a temporary destructor, but an automatic + // destructor. + BTE = nullptr; + } + } + } + + if (BTE) { + State = addInitializedTemporary(State, BTE, TempLC, + cast<CXXTempObjectRegion>(R)); + } + + if (MTE) { + State = addTemporaryMaterialization(State, MTE, TempLC, + cast<CXXTempObjectRegion>(R)); + } + } + + return State; +} + ProgramStateRef ExprEngine::setCXXNewAllocatorValue(ProgramStateRef State, const CXXNewExpr *CNE, Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp?rev=327347&r1=327346&r2=327347&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp Mon Mar 12 16:27:52 2018 @@ -265,55 +265,9 @@ void ExprEngine::VisitCXXConstructExpr(c assert(C || getCurrentCFGElement().getAs<CFGStmt>()); const ConstructionContext *CC = C ? C->getConstructionContext() : nullptr; - bool IsReturnedIntoParentStackFrame = false; - const CXXBindTemporaryExpr *BTE = nullptr; - const MaterializeTemporaryExpr *MTE = nullptr; - switch (CE->getConstructionKind()) { case CXXConstructExpr::CK_Complete: { Target = getRegionForConstructedObject(CE, Pred, CC, CallOpts); - - if (CC) { - // In case of temporary object construction, extract data necessary for - // destruction and lifetime extension. - const auto *TCC = dyn_cast<TemporaryObjectConstructionContext>(CC); - - // If the temporary is being returned from the function, it will be - // destroyed or lifetime-extended in the caller stack frame. - if (const auto *RCC = dyn_cast<ReturnedValueConstructionContext>(CC)) { - const StackFrameContext *SFC = LCtx->getCurrentStackFrame(); - assert(SFC); - if (SFC->getParent()) { - IsReturnedIntoParentStackFrame = true; - const CFGElement &CallElem = - (*SFC->getCallSiteBlock())[SFC->getIndex()]; - if (auto RTCElem = CallElem.getAs<CFGCXXRecordTypedCall>()) { - TCC = cast<TemporaryObjectConstructionContext>( - RTCElem->getConstructionContext()); - } - } - } - - if (TCC) { - assert(CallOpts.IsTemporaryCtorOrDtor); - assert(!CallOpts.IsCtorOrDtorWithImproperlyModeledTargetRegion); - if (AMgr.getAnalyzerOptions().includeTemporaryDtorsInCFG()) { - BTE = TCC->getCXXBindTemporaryExpr(); - MTE = TCC->getMaterializedTemporaryExpr(); - if (!BTE) { - // FIXME: lifetime extension for temporaries without destructors - // is not implemented yet. - MTE = nullptr; - } - if (MTE && MTE->getStorageDuration() != SD_FullExpression) { - // If the temporary is lifetime-extended, don't save the BTE, - // because we don't need a temporary destructor, but an automatic - // destructor. - BTE = nullptr; - } - } - } - } break; } case CXXConstructExpr::CK_VirtualBase: @@ -408,21 +362,7 @@ void ExprEngine::VisitCXXConstructExpr(c State = State->bindDefault(loc::MemRegionVal(Target), ZeroVal, LCtx); } - // Set up destruction and lifetime extension information. - const LocationContext *TempLCtx = - IsReturnedIntoParentStackFrame - ? LCtx->getCurrentStackFrame()->getParent() - : LCtx; - - if (BTE) { - State = addInitializedTemporary(State, BTE, TempLCtx, - cast<CXXTempObjectRegion>(Target)); - } - - if (MTE) { - State = addTemporaryMaterialization(State, MTE, TempLCtx, - cast<CXXTempObjectRegion>(Target)); - } + State = addAllNecessaryTemporaryInfo(State, CC, LCtx, Target); Bldr.generateNode(CE, *I, State, /*tag=*/nullptr, ProgramPoint::PreStmtKind); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
