4 files changed, 28 insertions, 0 deletions
diff --git a/clang/test/Import/struct-in-namespace/Inputs/N1.cpp b/clang/test/Import/struct-in-namespace/Inputs/N1.cpp
new file mode 100644
index 00000000000..ddb67a51621
--- /dev/null
+++ b/clang/test/Import/struct-in-namespace/Inputs/N1.cpp
@@ -0,0 +1,11 @@
+namespace N {
+  struct S {
+    int a;
+  };
+}
+
+namespace N {
+  struct T {
+    int b;
+  };
+}
diff --git a/clang/test/Import/struct-in-namespace/Inputs/N2.cpp b/clang/test/Import/struct-in-namespace/Inputs/N2.cpp
new file mode 100644
index 00000000000..ad97d5dd52e
--- /dev/null
+++ b/clang/test/Import/struct-in-namespace/Inputs/N2.cpp
@@ -0,0 +1,5 @@
+namespace N {
+  struct U {
+    int c;
+  };
+}
diff --git a/clang/test/Import/struct-in-namespace/Inputs/N3.cpp b/clang/test/Import/struct-in-namespace/Inputs/N3.cpp
new file mode 100644
index 00000000000..e0ec4146747
--- /dev/null
+++ b/clang/test/Import/struct-in-namespace/Inputs/N3.cpp
@@ -0,0 +1,5 @@
+namespace M {
+  struct V {
+    int d;
+  };
+}
diff --git a/clang/test/Import/struct-in-namespace/test.cpp b/clang/test/Import/struct-in-namespace/test.cpp
new file mode 100644
index 00000000000..fd14d82d178
--- /dev/null
+++ b/clang/test/Import/struct-in-namespace/test.cpp
@@ -0,0 +1,7 @@
+// RUN: clang-import-test -import %S/Inputs/N1.cpp -import %S/Inputs/N2.cpp -import %S/Inputs/N3.cpp -expression %s
+void expr() {
+  N::S s;
+  N::T t;
+  N::U u;
+  int d = s.a + t.b + u.c;
+}