[clang] 49c0ab6 - [clang][Checkers] Extend PthreadLockChecker state dump (NFC).

[Balázs Kéri via cfe-commits]

Author: Balázs Kéri
Date: 2021-03-31T11:19:42+02:00
New Revision: 49c0ab6d7611050ae902f6369fc878e17da453ad

URL: https://github.com/llvm/llvm-project/commit/49c0ab6d7611050ae902f6369fc878e17da453ad
DIFF: https://github.com/llvm/llvm-project/commit/49c0ab6d7611050ae902f6369fc878e17da453ad.diff

LOG: [clang][Checkers] Extend PthreadLockChecker state dump (NFC).

Add printing of map 'DestroyRetVal'.

Reviewed By: steakhal

Differential Revision: https://reviews.llvm.org/D98502

Added: 
    clang/test/Analysis/pthreadlock_state.c

Modified: 
    clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
index 88e80c481a5a7..eb10a42b7d3d8 100644
--- a/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
@@ -339,7 +339,16 @@ void PthreadLockChecker::printState(raw_ostream &Out, ProgramStateRef State,
     }
   }
 
-  // TODO: Dump destroyed mutex symbols?
+  DestroyRetValTy DRV = State->get<DestroyRetVal>();
+  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
index 0000000000000..dfbc10430bee9
--- /dev/null
+++ b/clang/test/Analysis/pthreadlock_state.c
@@ -0,0 +1,67 @@
+// 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": "alpha.core.PthreadLockBase", "messages": [
+  // CHECK-NEXT:      "Mutex states:",
+  // CHECK-NEXT:      "mtx: unlocked",
+  // CHECK-NEXT:      ""
+  // CHECK-NEXT:    ]}
+
+  pthread_mutex_lock(&mtx);
+  clang_analyzer_printState();
+  // CHECK:    { "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:    ]}
+
+  pthread_mutex_unlock(&mtx);
+  clang_analyzer_printState();
+  // CHECK:    { "checker": "alpha.core.PthreadLockBase", "messages": [
+  // CHECK-NEXT:      "Mutex states:",
+  // CHECK-NEXT:      "mtx: unlocked",
+  // CHECK-NEXT:      ""
+  // CHECK-NEXT:    ]}
+
+  int ret = pthread_mutex_destroy(&mtx);
+  clang_analyzer_printState();
+  // CHECK:    { "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_$
+  // CHECK-NEXT:      ""
+  // CHECK-NEXT:    ]}
+
+  if (ret)
+    return;
+
+  ret = pthread_mutex_destroy(mtx1);
+  clang_analyzer_printState();
+  // CHECK:    { "checker": "alpha.core.PthreadLockBase", "messages": [
+  // CHECK-NEXT:      "Mutex states:",
+  // CHECK-NEXT:      "mtx: destroyed",
+  // CHECK-NEXT:      "SymRegion{reg_$[[REG:[0-9]+]]<pthread_mutex_t * mtx1>}: not tracked, possibly destroyed",
+  // CHECK-NEXT:      "Mutexes in unresolved possibly destroyed state:",
+  // CHECK-NEXT:      "SymRegion{reg_$[[REG]]<pthread_mutex_t * mtx1>}: conj_$
+  // CHECK-NEXT:      ""
+  // CHECK-NEXT:    ]}
+  if (ret)
+    return;
+  pthread_mutex_init(mtx1, NULL);
+}