| Index: include/clang/Basic/DiagnosticSemaKinds.td |
| diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td |
| index 32289bd9183c2b2bbaf2f3a75b9534f020daf86b..cfd39adaab6a8d05c7523497da0dfda4b60e3542 100644 |
| --- a/include/clang/Basic/DiagnosticSemaKinds.td |
| +++ b/include/clang/Basic/DiagnosticSemaKinds.td |
| @@ -1400,7 +1400,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 " |
| + "expecting lock on '%0' to be held at start of " |
| "each loop">, |
| InGroup<ThreadSafety>, DefaultIgnore; |
| def warn_lock_exclusive_and_shared : Warning< |
| @@ -1413,16 +1413,10 @@ def warn_variable_requires_lock : Warning< |
| "%select{reading|writing}2 variable '%0' requires lock on '%1' to be " |
| "%select{held|held exclusively}2">, |
| InGroup<ThreadSafety>, DefaultIgnore; |
| -def warn_variable_requires_any_lock : Warning< |
| - "accessing variable '%0' requires some lock">, |
| - InGroup<ThreadSafety>, DefaultIgnore; |
| def warn_var_deref_requires_lock : Warning< |
| "%select{reading|writing}2 the value pointed to by '%0' requires lock on '%1'" |
| " to be %select{held|held exclusively}2">, |
| InGroup<ThreadSafety>, DefaultIgnore; |
| -def warn_var_deref_requires_any_lock : Warning< |
| - "accessing the value pointed to by '%0' requires some lock">, |
| - InGroup<ThreadSafety>, DefaultIgnore; |
| def warn_fun_requires_lock : Warning< |
| "calling function '%0' requires %select{shared|exclusive}2 lock on '%1'">, |
| InGroup<ThreadSafety>, DefaultIgnore; |
