3 files changed, 20 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/diag_pragma.h b/clang/test/Modules/Inputs/diag_pragma.h
new file mode 100644
index 00000000000..a8f958994ca
--- /dev/null
+++ b/clang/test/Modules/Inputs/diag_pragma.h
@@ -0,0 +1,3 @@
+#define DIAG_PRAGMA_MACRO 1
+
+#pragma clang diagnostic ignored "-Wparentheses"
diff --git a/clang/test/Modules/Inputs/module.map b/clang/test/Modules/Inputs/module.map
index 479bfcfa7ff..93ba4935ffd 100644
--- a/clang/test/Modules/Inputs/module.map
+++ b/clang/test/Modules/Inputs/module.map
@@ -188,3 +188,7 @@ module config {
   header "config.h"
   config_macros [exhaustive] WANT_FOO, WANT_BAR
 }
+
+module diag_pragma {
+  header "diag_pragma.h"
+}
diff --git a/clang/test/Modules/diag-pragma.c b/clang/test/Modules/diag-pragma.c
new file mode 100644
index 00000000000..7ec3400bba2
--- /dev/null
+++ b/clang/test/Modules/diag-pragma.c
@@ -0,0 +1,13 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diag_pragma %S/Inputs/module.map
+// RUN: %clang_cc1 -fmodules -x objective-c -verify -fmodules-cache-path=%t %s
+// FIXME: When we have a syntax for modules in C, use that.
+
+@import diag_pragma;
+
+int foo(int x) {
+  if (x = DIAG_PRAGMA_MACRO) // expected-warning {{using the result of an assignment as a condition without parentheses}} \
+                             // expected-note {{place parentheses}} expected-note {{use '=='}}
+    return 0;
+  return 1;
+}