3 files changed, 14 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/misplaced/misplaced-a.h b/clang/test/Modules/Inputs/misplaced/misplaced-a.h
new file mode 100644
index 00000000000..f50e5cefc3a
--- /dev/null
+++ b/clang/test/Modules/Inputs/misplaced/misplaced-a.h
@@ -0,0 +1,5 @@
+namespace A {
+  namespace B {  // expected-note{{namespace 'A::B' begins here}}
+    #include "misplaced-b.h"  // expected-error{{import of module 'Misplaced.Sub_B' appears within namespace 'A::B'}}
+  }
+}
diff --git a/clang/test/Modules/Inputs/misplaced/misplaced-b.h b/clang/test/Modules/Inputs/misplaced/misplaced-b.h
new file mode 100644
index 00000000000..68dd955ef82
--- /dev/null
+++ b/clang/test/Modules/Inputs/misplaced/misplaced-b.h
@@ -0,0 +1 @@
+int a;
+\ No newline at end of file
diff --git a/clang/test/Modules/Inputs/misplaced/misplaced.modulemap b/clang/test/Modules/Inputs/misplaced/misplaced.modulemap
new file mode 100644
index 00000000000..50aa7a47e50
--- /dev/null
+++ b/clang/test/Modules/Inputs/misplaced/misplaced.modulemap
@@ -0,0 +1,8 @@
+module Misplaced {
+  module Sub_A {
+    header "misplaced-a.h"
+  }
+  module Sub_B {
+    header "misplaced-b.h"
+  }
+}