5 files changed, 19 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/PR27699/Subdir/a.h b/clang/test/Modules/Inputs/PR27699/Subdir/a.h
new file mode 100644
index 00000000000..6c36a1a100b
--- /dev/null
+++ b/clang/test/Modules/Inputs/PR27699/Subdir/a.h
@@ -0,0 +1 @@
+#include "streambuf"
diff --git a/clang/test/Modules/Inputs/PR27699/Subdir/b.h b/clang/test/Modules/Inputs/PR27699/Subdir/b.h
new file mode 100644
index 00000000000..6c36a1a100b
--- /dev/null
+++ b/clang/test/Modules/Inputs/PR27699/Subdir/b.h
@@ -0,0 +1 @@
+#include "streambuf"
diff --git a/clang/test/Modules/Inputs/PR27699/module.modulemap b/clang/test/Modules/Inputs/PR27699/module.modulemap
new file mode 100644
index 00000000000..1f58ca06753
--- /dev/null
+++ b/clang/test/Modules/Inputs/PR27699/module.modulemap
@@ -0,0 +1 @@
+module a {   umbrella "Subdir" module * {export *} }
diff --git a/clang/test/Modules/Inputs/PR27699/streambuf b/clang/test/Modules/Inputs/PR27699/streambuf
new file mode 100644
index 00000000000..30ea73d230d
--- /dev/null
+++ b/clang/test/Modules/Inputs/PR27699/streambuf
@@ -0,0 +1,7 @@
+ #ifndef STREAMBUF
+ #define STREAMBUF
+ template <typename> struct basic_streambuf {
+  basic_streambuf(const basic_streambuf &);
+  };
+template <typename T> basic_streambuf<T>::basic_streambuf(const basic_streambuf &) = default;
+#endif
diff --git a/clang/test/Modules/pr27699.cpp b/clang/test/Modules/pr27699.cpp
new file mode 100644
index 00000000000..0a17fcba56f
--- /dev/null
+++ b/clang/test/Modules/pr27699.cpp
@@ -0,0 +1,9 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -std=c++11 -I%S/Inputs/PR27699 -verify %s
+// RUN: %clang_cc1 -std=c++11 -fmodules -fmodule-map-file=%S/Inputs/PR27699/module.modulemap -fmodules-cache-path=%t -fmodules-local-submodule-visibility -I%S/Inputs/PR27699 -verify %s
+
+#include "Subdir/a.h"
+#include "Subdir/b.h"
+
+// expected-no-diagnostics
+