7 files changed, 46 insertions, 2 deletions
diff --git a/test/Modules/Inputs/submodules/hash_map.h b/test/Modules/Inputs/submodules/hash_map.h
new file mode 100644
index 0000000000..56f0749752
--- /dev/null
+++ b/test/Modules/Inputs/submodules/hash_map.h
@@ -0,0 +1 @@
+template<typename Key, typename Data> class hash_map { };
diff --git a/test/Modules/Inputs/submodules/module.map b/test/Modules/Inputs/submodules/module.map
index 6d19975c96..16cedac231 100644
--- a/test/Modules/Inputs/submodules/module.map
+++ b/test/Modules/Inputs/submodules/module.map
@@ -1,4 +1,5 @@
 module std {
   module vector { header "vector.h" }
   module type_traits { header "type_traits.h" }
+  explicit module hash_map { header "hash_map.h" }
 }
diff --git a/test/Modules/Inputs/submodules/vector.h b/test/Modules/Inputs/submodules/vector.h
index 3123dd1c84..2dcf3e5731 100644
--- a/test/Modules/Inputs/submodules/vector.h
+++ b/test/Modules/Inputs/submodules/vector.h
@@ -1 +1 @@
-template<typename T> class vector;
+template<typename T> class vector { };
diff --git a/test/Modules/auto-module-import.c b/test/Modules/auto-module-import.c
index a161f33efa..1b5ef99590 100644
--- a/test/Modules/auto-module-import.c
+++ b/test/Modules/auto-module-import.c
@@ -11,3 +11,4 @@
 #ifdef DEPENDS_ON_MODULE
 #  error DEPENDS_ON_MODULE should have been hidden
 #endif
+
diff --git a/test/Modules/diamond.c b/test/Modules/diamond.c
index 59181c533d..93722e9fe2 100644
--- a/test/Modules/diamond.c
+++ b/test/Modules/diamond.c
@@ -5,6 +5,12 @@
 
 __import_module__ diamond_bottom;
 
+// FIXME: We want 'bottom' to re-export left and right, and both of those to
+// re-export 'top'.
+__import_module__ diamond_top;
+__import_module__ diamond_left;
+__import_module__ diamond_right;
+
 void test_diamond(int i, float f, double d, char c) {
   top(&i);
   left(&f);
diff --git a/test/Modules/submodules-preprocess.cpp b/test/Modules/submodules-preprocess.cpp
new file mode 100644
index 0000000000..1f0f37759c
--- /dev/null
+++ b/test/Modules/submodules-preprocess.cpp
@@ -0,0 +1,14 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -Eonly -fmodule-cache-path %t -fauto-module-import -I %S/Inputs/submodules %s -verify
+
+__import_module__ std.vector;
+
+vector<int> vi;
+remove_reference<int&>::type *int_ptr = 0;
+
+__import_module__ std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
+
+vector<float> vf;
+remove_reference<int&>::type *int_ptr2 = 0;
+
+__import_module__ std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
diff --git a/test/Modules/submodules.cpp b/test/Modules/submodules.cpp
index fd1426d012..ce7054f307 100644
--- a/test/Modules/submodules.cpp
+++ b/test/Modules/submodules.cpp
@@ -1,7 +1,28 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -Eonly -fmodule-cache-path %t -fauto-module-import -I %S/Inputs/submodules %s -verify
 // RUN: %clang_cc1 -fmodule-cache-path %t -fauto-module-import -I %S/Inputs/submodules %s -verify
 
 __import_module__ std.vector;
+
+vector<int> vi;
+
+// Note: remove_reference is not visible yet.
+remove_reference<int&>::type *int_ptr = 0; // expected-error{{unknown type name 'remove_reference'}} \
+// expected-error{{expected unqualified-id}}
+
 __import_module__ std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
+
+vector<float> vf;
+remove_reference<int&>::type *int_ptr2 = 0;
+
 __import_module__ std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
+
+__import_module__ std; // import everything in 'std'
+
+// hash_map still isn't available.
+hash_map<int, float> ints_to_floats; // expected-error{{unknown type name 'hash_map'}} \
+// expected-error{{expected unqualified-id}}
+
+__import_module__ std.hash_map;
+
+hash_map<int, float> ints_to_floats2;
+