Skip to content

Commit df4fa53

Browse files
committed
[clang][Checkers] Extend PthreadLockChecker state dump (NFC).
Add printing of map 'DestroyRetVal'. Reviewed By: steakhal Differential Revision: https://reviews.llvm.org/D98502
1 parent e3a1330 commit df4fa53

File tree

3 files changed

+92
-1
lines changed

3 files changed

+92
-1
lines changed

clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,16 @@ void PthreadLockChecker::printState(raw_ostream &Out, ProgramStateRef State,
339339
}
340340
}
341341

342-
// TODO: Dump destroyed mutex symbols?
342+
DestroyRetValTy DRV = State->get<DestroyRetVal>();
343+
if (!DRV.isEmpty()) {
344+
Out << Sep << "Mutexes in unresolved possibly destroyed state:" << NL;
345+
for (auto I : DRV) {
346+
I.first->dumpToStream(Out);
347+
Out << ": ";
348+
I.second->dumpToStream(Out);
349+
Out << NL;
350+
}
351+
}
343352
}
344353

345354
void PthreadLockChecker::AcquirePthreadLock(const CallEvent &Call,
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.unix.PthreadLock,debug.ExprInspection 2>&1 %s | FileCheck %s
2+
3+
#include "Inputs/system-header-simulator-for-pthread-lock.h"
4+
5+
#define NULL 0
6+
7+
void clang_analyzer_printState();
8+
9+
pthread_mutex_t mtx;
10+
11+
void test() {
12+
clang_analyzer_printState();
13+
// CHECK: "checker_messages": null
14+
15+
pthread_mutex_init(&mtx, NULL);
16+
clang_analyzer_printState();
17+
// CHECK: { "checker": "alpha.core.PthreadLockBase", "messages": [
18+
// CHECK-NEXT: "Mutex states:",
19+
// CHECK-NEXT: "mtx: unlocked",
20+
// CHECK-NEXT: ""
21+
// CHECK-NEXT: ]}
22+
23+
pthread_mutex_lock(&mtx);
24+
clang_analyzer_printState();
25+
// CHECK: { "checker": "alpha.core.PthreadLockBase", "messages": [
26+
// CHECK-NEXT: "Mutex states:",
27+
// CHECK-NEXT: "mtx: locked",
28+
// CHECK-NEXT: "Mutex lock order:",
29+
// CHECK-NEXT: "mtx",
30+
// CHECK-NEXT: ""
31+
// CHECK-NEXT: ]}
32+
33+
pthread_mutex_unlock(&mtx);
34+
clang_analyzer_printState();
35+
// CHECK: { "checker": "alpha.core.PthreadLockBase", "messages": [
36+
// CHECK-NEXT: "Mutex states:",
37+
// CHECK-NEXT: "mtx: unlocked",
38+
// CHECK-NEXT: ""
39+
// CHECK-NEXT: ]}
40+
41+
int ret = pthread_mutex_destroy(&mtx);
42+
clang_analyzer_printState();
43+
// CHECK: { "checker": "alpha.core.PthreadLockBase", "messages": [
44+
// CHECK-NEXT: "Mutex states:",
45+
// CHECK-NEXT: "mtx: unlocked, possibly destroyed",
46+
// CHECK-NEXT: "Mutexes in unresolved possibly destroyed state:",
47+
// CHECK-NEXT: "mtx: conj_$
48+
// CHECK-NEXT: ""
49+
// CHECK-NEXT: ]}
50+
51+
if (ret)
52+
return;
53+
54+
clang_analyzer_printState();
55+
// CHECK: { "checker": "alpha.core.PthreadLockBase", "messages": [
56+
// CHECK-NEXT: "Mutex states:",
57+
// CHECK-NEXT: "mtx: destroyed",
58+
// CHECK-NEXT: ""
59+
// CHECK-NEXT: ]}
60+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.unix.PthreadLock,debug.ExprInspection 2>&1 %s | FileCheck %s
2+
3+
#include "Inputs/system-header-simulator-for-pthread-lock.h"
4+
5+
#define NULL 0
6+
7+
void clang_analyzer_printState();
8+
9+
void test(pthread_mutex_t *mtx) {
10+
int ret = pthread_mutex_destroy(mtx);
11+
clang_analyzer_printState();
12+
// CHECK: { "checker": "alpha.core.PthreadLockBase", "messages": [
13+
// CHECK-NEXT: "Mutex states:",
14+
// CHECK-NEXT: "SymRegion{reg_$[[REG:[0-9]+]]<pthread_mutex_t * mtx>}: not tracked, possibly destroyed",
15+
// CHECK-NEXT: "Mutexes in unresolved possibly destroyed state:",
16+
// CHECK-NEXT: "SymRegion{reg_$[[REG]]<pthread_mutex_t * mtx>}: conj_$
17+
// CHECK-NEXT: ""
18+
// CHECK-NEXT: ]}
19+
if (ret)
20+
return;
21+
pthread_mutex_init(mtx, NULL);
22+
}

0 commit comments

Comments
 (0)