3 files changed, 74 insertions, 0 deletions
diff --git a/test/CodeCompletion/member-access.c b/test/CodeCompletion/member-access.c
new file mode 100644
index 0000000000..25b2b9ce22
--- /dev/null
+++ b/test/CodeCompletion/member-access.c
@@ -0,0 +1,13 @@
+// RUN: clang-cc -fsyntax-only -code-completion-dump=1 %s -o - | FileCheck -check-prefix=CC1 %s &&
+// RUN: true
+struct Point {
+  float x;
+  float y;
+  float z;
+};
+
+void test(struct Point *p) {
+  // CHECK-CC1: x
+  // CHECK-CC1: y
+  // CHECK-CC1: z
+  p->
+\ No newline at end of file
diff --git a/test/CodeCompletion/member-access.cpp b/test/CodeCompletion/member-access.cpp
new file mode 100644
index 0000000000..234a631870
--- /dev/null
+++ b/test/CodeCompletion/member-access.cpp
@@ -0,0 +1,42 @@
+// RUN: clang-cc -fsyntax-only -code-completion-dump=1 %s -o - | FileCheck -check-prefix=CC1 %s &&
+// RUN: true
+
+struct Base1 {
+  int member1;
+  float member2;
+};
+
+struct Base2 {
+  int member1;
+  double member3;
+  void memfun1(int);
+};
+
+struct Base3 : Base1, Base2 {
+  void memfun1(float);
+  void memfun1(double);
+  void memfun2(int);
+};
+
+struct Derived : Base3 {
+  int member4;
+  int memfun3(int);
+};
+
+class Proxy {
+public:
+  Derived *operator->() const;
+};
+
+void test(const Proxy &p) {
+  // CHECK-CC1: member4 : 0
+  // CHECK-CC1: memfun3 : 0
+  // CHECK-CC1: memfun1 : 1
+  // CHECK-CC1: memfun1 : 1
+  // CHECK-CC1: memfun2 : 1
+  // CHECK-CC1: member1 : 2
+  // CHECK-CC1: member1 : 2
+  // CHECK-CC1: member2 : 2
+  // CHECK-CC1: member3 : 2
+  // CHECK-CC1: memfun1 : 2 (Hidden)
+  p->
+\ No newline at end of file
diff --git a/test/CodeCompletion/nested-name-specifier.cpp b/test/CodeCompletion/nested-name-specifier.cpp
new file mode 100644
index 0000000000..f418164b02
--- /dev/null
+++ b/test/CodeCompletion/nested-name-specifier.cpp
@@ -0,0 +1,19 @@
+// RUN: clang-cc -fsyntax-only -code-completion-dump=1 %s -o - | FileCheck -check-prefix=CC1 %s &&
+// RUN: true
+
+namespace N {
+  struct A { };
+  namespace M { 
+    struct C { };
+  };
+}
+
+namespace N {
+  struct B { };
+}
+
+// CHECK-CC1: A : 0
+// CHECK-CC1: B : 0
+// CHECK-CC1: M : 0
+// CHECK-CC1: template : 0
+N::
+\ No newline at end of file