[cfe-commits] r139331 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/AnalysisBasedWarnings.cpp

[Caitlin Sadowski]

Author: supertri
Date: Thu Sep  8 18:17:03 2011
New Revision: 139331

URL: http://llvm.org/viewvc/llvm-project?rev=139331&view=rev
Log:
Thread safety: small edit to unused variation on warning left in by accident from earlier commit

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=139331&r1=139330&r2=139331&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Thu Sep  8 18:17:03 2011
@@ -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">,

Modified: cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp?rev=139331&r1=139330&r2=139331&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp (original)
+++ cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp Thu Sep  8 18:17:03 2011
@@ -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));
     }
   }