4 files changed, 15 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/deferred-lookup/a.h b/clang/test/Modules/Inputs/deferred-lookup/a.h
new file mode 100644
index 00000000000..751aae01496
--- /dev/null
+++ b/clang/test/Modules/Inputs/deferred-lookup/a.h
@@ -0,0 +1 @@
+namespace N { int f(int); }
diff --git a/clang/test/Modules/Inputs/deferred-lookup/b.h b/clang/test/Modules/Inputs/deferred-lookup/b.h
new file mode 100644
index 00000000000..23925e2e93c
--- /dev/null
+++ b/clang/test/Modules/Inputs/deferred-lookup/b.h
@@ -0,0 +1,6 @@
+namespace N { template<typename T> struct A { friend int f(A); }; }
+namespace N { int f(int); }
+namespace N { int f(int); }
+#include "a.h"
+namespace N { int f(int); }
+inline int g() { return f(N::A<int>()); }
diff --git a/clang/test/Modules/Inputs/deferred-lookup/module.modulemap b/clang/test/Modules/Inputs/deferred-lookup/module.modulemap
new file mode 100644
index 00000000000..61578a1865a
--- /dev/null
+++ b/clang/test/Modules/Inputs/deferred-lookup/module.modulemap
@@ -0,0 +1,2 @@
+module a { header "a.h" export * }
+module b { header "b.h" export * }
diff --git a/clang/test/Modules/deferred-lookup.cpp b/clang/test/Modules/deferred-lookup.cpp
new file mode 100644
index 00000000000..aaac389da0d
--- /dev/null
+++ b/clang/test/Modules/deferred-lookup.cpp
@@ -0,0 +1,6 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I%S/Inputs/deferred-lookup -verify %s
+// expected-no-diagnostics
+
+namespace N { int f(int); }
+#include "b.h"