diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 56db548aa6d0cb23e7d39dea0029b3b1de6f13ff..33506401cfe8f68c6dc07475fb1b70117c04d095 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -9761,7 +9761,11 @@ void Sema::ActOnTagFinishDefinition(Scope *S, Decl *TagD,
 
   // Exit this scope of this tag's definition.
   PopDeclContext();
-                                          
+
+  if (getCurLexicalContext()->isObjCContainer() &&
+      Tag->getDeclContext()->isFileContext())
+    Tag->setTopLevelDeclInObjCContainer();
+
   // Notify the consumer that we've defined a tag.
   Consumer.HandleTagDeclDefinition(Tag);
 }
diff --git a/clang/test/Index/getcursor-preamble.h b/clang/test/Index/getcursor-preamble.h
new file mode 100644
index 0000000000000000000000000000000000000000..519e655c6ee3dc5f2eba253efafa2270a7ef1b54
--- /dev/null
+++ b/clang/test/Index/getcursor-preamble.h
@@ -0,0 +1,8 @@
+@interface I {
+  struct AA {
+    int x;
+  } aa;
+  int var;
+}
+-(id)foo;
+@end
diff --git a/clang/test/Index/getcursor-preamble.m b/clang/test/Index/getcursor-preamble.m
new file mode 100644
index 0000000000000000000000000000000000000000..eb9d72e2b65910d0e507f5e2963c86a45aabdc3b
--- /dev/null
+++ b/clang/test/Index/getcursor-preamble.m
@@ -0,0 +1,21 @@
+#include "getcursor-preamble.h"
+
+// RUN: c-index-test -cursor-at=%S/getcursor-preamble.h:2:10 \
+// RUN:    -cursor-at=%S/getcursor-preamble.h:3:9 \
+// RUN:    -cursor-at=%S/getcursor-preamble.h:4:6 \
+// RUN:    -cursor-at=%S/getcursor-preamble.h:5:8 \
+// RUN:    -cursor-at=%S/getcursor-preamble.h:7:7 \
+// RUN:             %s | FileCheck %s
+
+// RUN: CINDEXTEST_EDITING=1 c-index-test -cursor-at=%S/getcursor-preamble.h:2:10 \
+// RUN:    -cursor-at=%S/getcursor-preamble.h:3:9 \
+// RUN:    -cursor-at=%S/getcursor-preamble.h:4:6 \
+// RUN:    -cursor-at=%S/getcursor-preamble.h:5:8 \
+// RUN:    -cursor-at=%S/getcursor-preamble.h:7:7 \
+// RUN:             %s | FileCheck %s
+
+// CHECK: StructDecl=AA:2:10
+// CHECK: FieldDecl=x:3:9
+// CHECK: ObjCIvarDecl=aa:4:5
+// CHECK: ObjCIvarDecl=var:5:7
+// CHECK: ObjCInstanceMethodDecl=foo:7:6