diff --git a/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp --- a/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp @@ -339,7 +339,16 @@ } } - // TODO: Dump destroyed mutex symbols? + DestroyRetValTy DRV = State->get(); + if (!DRV.isEmpty()) { + Out << Sep << "Mutexes in unresolved possibly destroyed state:" << NL; + for (auto I : DRV) { + I.first->dumpToStream(Out); + Out << ": "; + I.second->dumpToStream(Out); + Out << NL; + } + } } void PthreadLockChecker::AcquirePthreadLock(const CallEvent &Call, diff --git a/clang/test/Analysis/pthreadlock_state.c b/clang/test/Analysis/pthreadlock_state.c new file mode 100644 --- /dev/null +++ b/clang/test/Analysis/pthreadlock_state.c @@ -0,0 +1,77 @@ +// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.unix.PthreadLock,debug.ExprInspection 2>&1 %s | FileCheck %s + +#include "Inputs/system-header-simulator-for-pthread-lock.h" + +#define NULL 0 + +void clang_analyzer_printState(); + +pthread_mutex_t mtx; + +void test(pthread_mutex_t *mtx1) { + clang_analyzer_printState(); + // CHECK: "checker_messages": null + + pthread_mutex_init(&mtx, NULL); + clang_analyzer_printState(); + // CHECK: "checker_messages": [ + // CHECK-NEXT: { "checker": "alpha.core.PthreadLockBase", "messages": [ + // CHECK-NEXT: "Mutex states:", + // CHECK-NEXT: "mtx: unlocked", + // CHECK-NEXT: "" + // CHECK-NEXT: ]} + // CHECK-NEXT: ] + + pthread_mutex_lock(&mtx); + clang_analyzer_printState(); + // CHECK: "checker_messages": [ + // CHECK-NEXT: { "checker": "alpha.core.PthreadLockBase", "messages": [ + // CHECK-NEXT: "Mutex states:", + // CHECK-NEXT: "mtx: locked", + // CHECK-NEXT: "Mutex lock order:", + // CHECK-NEXT: "mtx", + // CHECK-NEXT: "" + // CHECK-NEXT: ]} + // CHECK-NEXT: ] + + pthread_mutex_unlock(&mtx); + clang_analyzer_printState(); + // CHECK: "checker_messages": [ + // CHECK-NEXT: { "checker": "alpha.core.PthreadLockBase", "messages": [ + // CHECK-NEXT: "Mutex states:", + // CHECK-NEXT: "mtx: unlocked", + // CHECK-NEXT: "" + // CHECK-NEXT: ]} + // CHECK-NEXT: ] + + int ret = pthread_mutex_destroy(&mtx); + clang_analyzer_printState(); + // CHECK: "checker_messages": [ + // CHECK-NEXT: { "checker": "alpha.core.PthreadLockBase", "messages": [ + // CHECK-NEXT: "Mutex states:", + // CHECK-NEXT: "mtx: unlocked, possibly destroyed", + // CHECK-NEXT: "Mutexes in unresolved possibly destroyed state:", + // CHECK-NEXT: "mtx: conj_$11{int, LC1, S1874, #1}", + // CHECK-NEXT: "" + // CHECK-NEXT: ]} + // CHECK-NEXT: ] + + if (ret) + return; + + ret = pthread_mutex_destroy(mtx1); + clang_analyzer_printState(); + // CHECK: "checker_messages": [ + // CHECK-NEXT: { "checker": "alpha.core.PthreadLockBase", "messages": [ + // CHECK-NEXT: "Mutex states:", + // CHECK-NEXT: "mtx: destroyed", + // CHECK-NEXT: "SymRegion{reg_$12}: not tracked, possibly destroyed", + // CHECK-NEXT: "Mutexes in unresolved possibly destroyed state:", + // CHECK-NEXT: "SymRegion{reg_$12}: conj_$15{int, LC1, S1921, #1}", + // CHECK-NEXT: "" + // CHECK-NEXT: ]} + // CHECK-NEXT: ] + if (ret) + return; + pthread_mutex_init(mtx1, NULL); +}