Author: Balazs Benics Date: 2021-06-29T16:35:07+02:00 New Revision: 3dae01911b6902f00e80eb7ebdc2f55bb28f173e
URL: https://github.com/llvm/llvm-project/commit/3dae01911b6902f00e80eb7ebdc2f55bb28f173e DIFF: https://github.com/llvm/llvm-project/commit/3dae01911b6902f00e80eb7ebdc2f55bb28f173e.diff LOG: [analyzer] Make CheckerManager::hasPathSensitiveCheckers() complete again It turns out that the CheckerManager::hasPathSensitiveCheckers() missed checking for the BeginFunctionCheckers. It seems like other callbacks are also missing: - ObjCMessageNilCheckers - BeginFunctionCheckers - NewAllocatorCheckers - PointerEscapeCheckers - EndOfTranslationUnitCheckers In this patch, I wanted to use a fold-expression, but until C++17 arrives we are left with the old-school method. When I tried to write a unittest I observed an interesting behavior. I subscribed only to the BeginFunction event, it was not fired. However, when I also defined the PreCall with an empty handler, suddenly both fired. I could add this test demonstrating the issue, but I don't think it would serve much value in a long run. I don't expect regressions for this. However, I think it would be great to enforce the completeness of this list in a runtime check. I could not come up with a solution for this though. PS: Thank you @Szelethus for helping me debugging this. Differential Revision: https://reviews.llvm.org/D105101 Reviewed by: vsavchenko Added: Modified: clang/lib/StaticAnalyzer/Core/CheckerManager.cpp Removed: ################################################################################ diff --git a/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp b/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp index 86cecf6524f0..e09399a83589 100644 --- a/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp +++ b/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp @@ -33,21 +33,20 @@ using namespace clang; using namespace ento; bool CheckerManager::hasPathSensitiveCheckers() const { - return !StmtCheckers.empty() || - !PreObjCMessageCheckers.empty() || - !PostObjCMessageCheckers.empty() || - !PreCallCheckers.empty() || - !PostCallCheckers.empty() || - !LocationCheckers.empty() || - !BindCheckers.empty() || - !EndAnalysisCheckers.empty() || - !EndFunctionCheckers.empty() || - !BranchConditionCheckers.empty() || - !LiveSymbolsCheckers.empty() || - !DeadSymbolsCheckers.empty() || - !RegionChangesCheckers.empty() || - !EvalAssumeCheckers.empty() || - !EvalCallCheckers.empty(); + const auto IfAnyAreNonEmpty = [](const auto &... Callbacks) -> bool { + bool Result = false; + // FIXME: Use fold expressions in C++17. + LLVM_ATTRIBUTE_UNUSED int Unused[]{0, (Result |= !Callbacks.empty())...}; + return Result; + }; + return IfAnyAreNonEmpty( + StmtCheckers, PreObjCMessageCheckers, ObjCMessageNilCheckers, + PostObjCMessageCheckers, PreCallCheckers, PostCallCheckers, + LocationCheckers, BindCheckers, EndAnalysisCheckers, + BeginFunctionCheckers, EndFunctionCheckers, BranchConditionCheckers, + NewAllocatorCheckers, LiveSymbolsCheckers, DeadSymbolsCheckers, + RegionChangesCheckers, PointerEscapeCheckers, EvalAssumeCheckers, + EvalCallCheckers, EndOfTranslationUnitCheckers); } void CheckerManager::finishedCheckerRegistration() { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
