summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Puchert <aaron.puchert@sap.com>2019-01-30 00:18:24 +0000
committerAaron Puchert <aaron.puchert@sap.com>2019-01-30 00:18:24 +0000
commita15f5d0e4cd858c801717023d9f31d488be9edc7 (patch)
treee62414817292e31aefa1e0298892db15280719b8
parentc7d2e5f1542777d4f3b8a2b5e46480d437b4e7b9 (diff)
downloadbcm5719-llvm-a15f5d0e4cd858c801717023d9f31d488be9edc7.tar.gz
bcm5719-llvm-a15f5d0e4cd858c801717023d9f31d488be9edc7.zip
Fix thread safety tests after r352549
llvm-svn: 352574
-rw-r--r--clang/test/PCH/thread-safety-attrs.cpp2
-rw-r--r--clang/test/Sema/warn-thread-safety-analysis.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/PCH/thread-safety-attrs.cpp b/clang/test/PCH/thread-safety-attrs.cpp
index 3e6f029632e..ae2a413af31 100644
--- a/clang/test/PCH/thread-safety-attrs.cpp
+++ b/clang/test/PCH/thread-safety-attrs.cpp
@@ -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();
diff --git a/clang/test/Sema/warn-thread-safety-analysis.c b/clang/test/Sema/warn-thread-safety-analysis.c
index 0a375b873e6..52dacfce06e 100644
--- a/clang/test/Sema/warn-thread-safety-analysis.c
+++ b/clang/test/Sema/warn-thread-safety-analysis.c
@@ -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);
OpenPOWER on IntegriCloud