Thread safety: small edit to unused variation on warning left in by accident from...

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 08877a063b885ef6ca3b3a3182069a016fdfe3a9..15d5ad1cc66cac6b66aeef3a63774d8ad5ba1652 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1402,8 +1402,7 @@ def warn_lock_at_end_of_scope : Warning<
   "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 afbfabf674752b85d2efb1f5038f78d41ab87752..20d83fe507a9bca853b582ff086c0ddac0393e80 100644 (file)
--- a/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/lib/Sema/AnalysisBasedWarnings.cpp
@@ -1274,8 +1274,7 @@ static void warnBackEdgeUnequalLocksets(Sema &S, const Lockset LoopReentrySet,
       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));
     }
   }