https://github.com/gamesh411 updated https://github.com/llvm/llvm-project/pull/90030
From de695f8e556e1efd6b2a4e69f916467af94e0c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Endre=20F=C3=BCl=C3=B6p?= <endre.fu...@sigmatechnology.com> Date: Tue, 9 Apr 2024 10:44:43 +0200 Subject: [PATCH 1/2] [clang][analyzer] Fix alpha.unix.BlockInCriticalSection for CTU In CTU there is not always an AnalysisDeclContext for a given call. This led to crashes. The AnalysisDeclContext access is now checked. --- .../Checkers/BlockInCriticalSectionChecker.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/clang/lib/StaticAnalyzer/Checkers/BlockInCriticalSectionChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/BlockInCriticalSectionChecker.cpp index e4373915410fb..9874a68ebe47a 100644 --- a/clang/lib/StaticAnalyzer/Checkers/BlockInCriticalSectionChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/BlockInCriticalSectionChecker.cpp @@ -14,6 +14,7 @@ // //===----------------------------------------------------------------------===// +#include "clang/Analysis/AnalysisDeclContext.h" #include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" #include "clang/StaticAnalyzer/Core/Checker.h" @@ -103,9 +104,10 @@ class RAIIMutexDescriptor { // this function is called instead of early returning it. To avoid this, a // bool variable (IdentifierInfoInitialized) is used and the function will // be run only once. - Guard = &Call.getCalleeAnalysisDeclContext()->getASTContext().Idents.get( - GuardName); - IdentifierInfoInitialized = true; + if (AnalysisDeclContext *CalleCtx = Call.getCalleeAnalysisDeclContext()) { + Guard = &CalleCtx->getASTContext().Idents.get(GuardName); + IdentifierInfoInitialized = true; + } } } From d811a172dd9d07a895b84aa873eb6636a4fa008d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Endre=20F=C3=BCl=C3=B6p?= <endre.fu...@sigmatechnology.com> Date: Tue, 14 May 2024 14:43:30 +0200 Subject: [PATCH 2/2] Add crashing test --- clang/test/Analysis/block-in-critical-section.c | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 clang/test/Analysis/block-in-critical-section.c diff --git a/clang/test/Analysis/block-in-critical-section.c b/clang/test/Analysis/block-in-critical-section.c new file mode 100644 index 0000000000000..1e174af541b18 --- /dev/null +++ b/clang/test/Analysis/block-in-critical-section.c @@ -0,0 +1,6 @@ +// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.unix.BlockInCriticalSection -verify %s +// expected-no-diagnostics + +// This should not crash +int (*a)(void); +void b(void) { a(); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits