diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 3 | ||||
| -rw-r--r-- | lib/Sema/AnalysisBasedWarnings.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 08877a063b..15d5ad1cc6 100644 --- 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 afbfabf674..20d83fe507 100644 --- 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)); } } |