3 files changed, 30 insertions, 0 deletions
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 478217bd03..9fe6ef317e 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -1661,6 +1661,10 @@ ASTReader::ReadASTBlock(ModuleFile &F) {
         return Failure;
       }
 
+      DeclContext *DC = Context.getTranslationUnitDecl();
+      if (!DC->hasExternalVisibleStorage() && DC->hasExternalLexicalStorage())
+        DC->setMustBuildLookupTable();
+
       return Success;
     }
 
diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
index 754ff36db7..c9788a3216 100644
--- a/lib/Serialization/ASTReaderDecl.cpp
+++ b/lib/Serialization/ASTReaderDecl.cpp
@@ -2127,6 +2127,9 @@ Decl *ASTReader::ReadDeclRecord(DeclID ID) {
       }
       PendingVisibleUpdates.erase(I);
     }
+
+    if (!DC->hasExternalVisibleStorage() && DC->hasExternalLexicalStorage())
+      DC->setMustBuildLookupTable();
   }
   assert(Idx == Record.size());
 
diff --git a/test/Index/rdar12316296-codecompletion.m b/test/Index/rdar12316296-codecompletion.m
new file mode 100644
index 0000000000..f588a99837
--- /dev/null
+++ b/test/Index/rdar12316296-codecompletion.m
@@ -0,0 +1,23 @@
+// RUN: c-index-test -write-pch %t.h.pch %s
+// RUN: c-index-test -code-completion-at=%s:19:1 %s -include %t.h | FileCheck %s
+
+// <rdar://12316296> clang Code Completion returns nothing but preprocessor macros
+
+#ifndef HEADER
+#define HEADER
+
+@interface I
+@end
+
+// CHECK: FunctionDecl:{ResultType void}{TypedText foo}
+void foo();
+
+#else
+
+@implementation I
+-(void)meth {
+
+}
+@end
+
+#endif