4 files changed, 20 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/submodules/module.map b/clang/test/Modules/Inputs/submodules/module.map
new file mode 100644
index 00000000000..6d19975c964
--- /dev/null
+++ b/clang/test/Modules/Inputs/submodules/module.map
@@ -0,0 +1,4 @@
+module std {
+  module vector { header "vector.h" }
+  module type_traits { header "type_traits.h" }
+}
diff --git a/clang/test/Modules/Inputs/submodules/type_traits.h b/clang/test/Modules/Inputs/submodules/type_traits.h
new file mode 100644
index 00000000000..9ef9006fbc4
--- /dev/null
+++ b/clang/test/Modules/Inputs/submodules/type_traits.h
@@ -0,0 +1,9 @@
+template<typename T>
+struct remove_reference {
+  typedef T type;
+};
+
+template<typename T>
+struct remove_reference<T&> {
+  typedef T type;
+};
diff --git a/clang/test/Modules/Inputs/submodules/vector.h b/clang/test/Modules/Inputs/submodules/vector.h
new file mode 100644
index 00000000000..3123dd1c84b
--- /dev/null
+++ b/clang/test/Modules/Inputs/submodules/vector.h
@@ -0,0 +1 @@
+template<typename T> class vector;
diff --git a/clang/test/Modules/submodules.cpp b/clang/test/Modules/submodules.cpp
new file mode 100644
index 00000000000..6d541f69e7c
--- /dev/null
+++ b/clang/test/Modules/submodules.cpp
@@ -0,0 +1,6 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodule-cache-path %t -fauto-module-import -I %S/Inputs/submodules %s -verify
+
+__import_module__ std.vector;
+__import_module__ std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
+__import_module__ std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}