aaronpuchert created this revision. aaronpuchert added a reviewer: aaron.ballman. Herald added a project: clang. Herald added a subscriber: cfe-commits.
Other warning messages for negative capabilities also mention their kind, and the double space was ugly. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D84603 Files: clang/lib/Analysis/ThreadSafety.cpp clang/test/SemaCXX/warn-thread-safety-analysis.cpp clang/test/SemaCXX/warn-thread-safety-negative.cpp Index: clang/test/SemaCXX/warn-thread-safety-negative.cpp =================================================================== --- clang/test/SemaCXX/warn-thread-safety-negative.cpp +++ clang/test/SemaCXX/warn-thread-safety-negative.cpp @@ -50,7 +50,7 @@ } void bar() { - baz(); // expected-warning {{calling function 'baz' requires holding '!mu'}} + baz(); // expected-warning {{calling function 'baz' requires holding negative capability '!mu'}} } void baz() EXCLUSIVE_LOCKS_REQUIRED(!mu) { Index: clang/test/SemaCXX/warn-thread-safety-analysis.cpp =================================================================== --- clang/test/SemaCXX/warn-thread-safety-analysis.cpp +++ clang/test/SemaCXX/warn-thread-safety-analysis.cpp @@ -4985,7 +4985,7 @@ } void bar() { - bar2(); // expected-warning {{calling function 'bar2' requires holding '!mu'}} + bar2(); // expected-warning {{calling function 'bar2' requires holding negative capability '!mu'}} } void bar2() EXCLUSIVE_LOCKS_REQUIRED(!mu) { Index: clang/lib/Analysis/ThreadSafety.cpp =================================================================== --- clang/lib/Analysis/ThreadSafety.cpp +++ clang/lib/Analysis/ThreadSafety.cpp @@ -1641,8 +1641,8 @@ // Otherwise the negative requirement must be propagated to the caller. LDat = FSet.findLock(Analyzer->FactMan, Cp); if (!LDat) { - Analyzer->Handler.handleMutexNotHeld("", D, POK, Cp.toString(), - LK_Shared, Loc); + Analyzer->Handler.handleMutexNotHeld("negative capability", D, POK, + Cp.toString(), LK_Shared, Loc); } return; }
Index: clang/test/SemaCXX/warn-thread-safety-negative.cpp =================================================================== --- clang/test/SemaCXX/warn-thread-safety-negative.cpp +++ clang/test/SemaCXX/warn-thread-safety-negative.cpp @@ -50,7 +50,7 @@ } void bar() { - baz(); // expected-warning {{calling function 'baz' requires holding '!mu'}} + baz(); // expected-warning {{calling function 'baz' requires holding negative capability '!mu'}} } void baz() EXCLUSIVE_LOCKS_REQUIRED(!mu) { Index: clang/test/SemaCXX/warn-thread-safety-analysis.cpp =================================================================== --- clang/test/SemaCXX/warn-thread-safety-analysis.cpp +++ clang/test/SemaCXX/warn-thread-safety-analysis.cpp @@ -4985,7 +4985,7 @@ } void bar() { - bar2(); // expected-warning {{calling function 'bar2' requires holding '!mu'}} + bar2(); // expected-warning {{calling function 'bar2' requires holding negative capability '!mu'}} } void bar2() EXCLUSIVE_LOCKS_REQUIRED(!mu) { Index: clang/lib/Analysis/ThreadSafety.cpp =================================================================== --- clang/lib/Analysis/ThreadSafety.cpp +++ clang/lib/Analysis/ThreadSafety.cpp @@ -1641,8 +1641,8 @@ // Otherwise the negative requirement must be propagated to the caller. LDat = FSet.findLock(Analyzer->FactMan, Cp); if (!LDat) { - Analyzer->Handler.handleMutexNotHeld("", D, POK, Cp.toString(), - LK_Shared, Loc); + Analyzer->Handler.handleMutexNotHeld("negative capability", D, POK, + Cp.toString(), LK_Shared, Loc); } return; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits