r352574 - Fix thread safety tests after r352549

[Aaron Puchert via cfe-commits]

Author: aaronpuchert
Date: Tue Jan 29 16:18:24 2019
New Revision: 352574

URL: http://llvm.org/viewvc/llvm-project?rev=352574&view=rev
Log:
Fix thread safety tests after r352549

Modified:
    cfe/trunk/test/PCH/thread-safety-attrs.cpp
    cfe/trunk/test/Sema/warn-thread-safety-analysis.c

Modified: cfe/trunk/test/PCH/thread-safety-attrs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/thread-safety-attrs.cpp?rev=352574&r1=352573&r2=352574&view=diff
==============================================================================
--- cfe/trunk/test/PCH/thread-safety-attrs.cpp (original)
+++ cfe/trunk/test/PCH/thread-safety-attrs.cpp Tue Jan 29 16:18:24 2019
@@ -213,7 +213,7 @@ void sls_fun_bad_1() {
 }
 
 void sls_fun_bad_2() {
-  sls_mu.Lock();
+  sls_mu.Lock(); // expected-note{{mutex acquired here}}
   sls_mu.Lock(); // \
     // expected-warning{{acquiring mutex 'sls_mu' that is already held}}
   sls_mu.Unlock();

Modified: cfe/trunk/test/Sema/warn-thread-safety-analysis.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/warn-thread-safety-analysis.c?rev=352574&r1=352573&r2=352574&view=diff
==============================================================================
--- cfe/trunk/test/Sema/warn-thread-safety-analysis.c (original)
+++ cfe/trunk/test/Sema/warn-thread-safety-analysis.c Tue Jan 29 16:18:24 2019
@@ -77,7 +77,7 @@ int main() {
   Foo_fun1(1); // expected-warning{{calling function 'Foo_fun1' requires holding mutex 'mu2'}} \
                   expected-warning{{calling function 'Foo_fun1' requires holding mutex 'mu1' exclusively}}
 
-  mutex_exclusive_lock(&mu1);
+  mutex_exclusive_lock(&mu1); // expected-note{{mutex acquired here}}
   mutex_shared_lock(&mu2);
   Foo_fun1(1);