[modules] Fix thread safety analysis to cope with merging of FieldDecls across modules.

llvm-svn: 244714

1 files changed, 18 insertions, 0 deletions

diff --git a/clang/test/Modules/thread-safety.cpp b/clang/test/Modules/thread-safety.cpp
new file mode 100644
index 00000000000..e6e85d284c8
--- /dev/null
+++ b/clang/test/Modules/thread-safety.cpp
@@ -0,0 +1,18 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fimplicit-module-maps \
+// RUN:            -I%S/Inputs/thread-safety -std=c++11 -Wthread-safety \
+// RUN:            -verify %s
+//
+// expected-no-diagnostics
+
+#include "b.h"
+#include "c.h"
+
+bool g();
+void X::f() {
+  m.lock();
+  if (g())
+    m.unlock();
+  else
+    unlock(*this);
+}