4 files changed, 22 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/MacroFabs1.h b/clang/test/Modules/Inputs/MacroFabs1.h
new file mode 100644
index 00000000000..a78c5539f4a
--- /dev/null
+++ b/clang/test/Modules/Inputs/MacroFabs1.h
@@ -0,0 +1,6 @@
+
+#undef fabs
+#define fabs(x) (x)
+
+#undef my_fabs
+#define my_fabs(x) (x)
diff --git a/clang/test/Modules/Inputs/module.map b/clang/test/Modules/Inputs/module.map
index 4db1cca925c..6846690c849 100644
--- a/clang/test/Modules/Inputs/module.map
+++ b/clang/test/Modules/Inputs/module.map
@@ -414,3 +414,7 @@ module MethodPoolString2 {
 }
 
 module Empty {}
+
+module MacroFabs1 {
+  header "MacroFabs1.h"
+}
diff --git a/clang/test/Modules/Inputs/pch-import-module-with-macro.pch b/clang/test/Modules/Inputs/pch-import-module-with-macro.pch
new file mode 100644
index 00000000000..c06d7728b62
--- /dev/null
+++ b/clang/test/Modules/Inputs/pch-import-module-with-macro.pch
@@ -0,0 +1,3 @@
+
+@import MacroFabs1;
+
diff --git a/clang/test/Modules/pch-module-macro.m b/clang/test/Modules/pch-module-macro.m
new file mode 100644
index 00000000000..cc9f6873745
--- /dev/null
+++ b/clang/test/Modules/pch-module-macro.m
@@ -0,0 +1,9 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -emit-pch -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -o %t.pch -I %S/Inputs -x objective-c-header %S/Inputs/pch-import-module-with-macro.pch
+// RUN: %clang_cc1 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -fsyntax-only -I %S/Inputs -include-pch %t.pch %s -verify
+// expected-no-diagnostics
+
+int test(int x) {
+  return my_fabs(x) + fabs(x);
+}
+