Thread safety: small edit to unused variation on warning left in by accident from earlier commit
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@139331 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 08877a0..15d5ad1 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1402,8 +1402,7 @@
"mutex '%0' is still held at the end of its scope">,
InGroup<ThreadSafety>, DefaultIgnore;
def warn_expecting_lock_held_on_loop : Warning<
- "expecting lock on '%0' to be %select{held|held exclusively}1 at start of "
- "each loop">,
+ "expecting lock on '%0' to be held at start of each loop">,
InGroup<ThreadSafety>, DefaultIgnore;
def warn_lock_exclusive_and_shared : Warning<
"lock '%0' is exclusive and shared in the same scope">,
diff --git a/lib/Sema/AnalysisBasedWarnings.cpp b/lib/Sema/AnalysisBasedWarnings.cpp
index afbfabf..20d83fe 100644
--- a/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/lib/Sema/AnalysisBasedWarnings.cpp
@@ -1274,8 +1274,7 @@
const MutexID &Mutex = I.getKey();
// We report this error at the location of the first statement in a loop
PartialDiagnostic Warning =
- S.PDiag(diag::warn_expecting_lock_held_on_loop)
- << Mutex.getName() << LK_Shared;
+ S.PDiag(diag::warn_expecting_lock_held_on_loop) << Mutex.getName();
Warnings.push_back(DelayedDiag(FirstLocInLoop, Warning));
}
}
