Order the methods in the global method pool based on when they become visible, not when they become deserialized <rdar://problem/13203033>.

llvm-svn: 175018

4 files changed, 62 insertions, 9 deletions

diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 53fa21f9aaa..6f0dcaae304 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -2594,13 +2594,50 @@ bool ASTReader::ReadASTBlock(ModuleFile &F) {
   }
 }
 
+/// \brief Move the given method to the back of the global list of methods.
+static void moveMethodToBackOfGlobalList(Sema &S, ObjCMethodDecl *Method) {
+  // Find the entry for this selector in the method pool.
+  Sema::GlobalMethodPool::iterator Known
+    = S.MethodPool.find(Method->getSelector());
+  if (Known == S.MethodPool.end())
+    return;
+
+  // Retrieve the appropriate method list.
+  ObjCMethodList &Start = Method->isInstanceMethod()? Known->second.first
+                                                    : Known->second.second;
+  bool Found = false;
+  for (ObjCMethodList *List = &Start; List; List = List->Next) {
+    if (!Found) {
+      if (List->Method == Method) {
+        Found = true;
+      } else {
+        // Keep searching.
+        continue;
+      }
+    }
+
+    if (List->Next)
+      List->Method = List->Next->Method;
+    else
+      List->Method = Method;
+  }
+}
+
 void ASTReader::makeNamesVisible(const HiddenNames &Names) {
   for (unsigned I = 0, N = Names.size(); I != N; ++I) {
     switch (Names[I].getKind()) {
-    case HiddenName::Declaration:
-      Names[I].getDecl()->Hidden = false;
+    case HiddenName::Declaration: {
+      Decl *D = Names[I].getDecl();
+      bool wasHidden = D->Hidden;
+      D->Hidden = false;
+
+      if (wasHidden && SemaObj) {
+        if (ObjCMethodDecl *Method = dyn_cast<ObjCMethodDecl>(D)) {
+          moveMethodToBackOfGlobalList(*SemaObj, Method);
+        }
+      }
       break;
-
+    }
     case HiddenName::MacroVisibility: {
       std::pair<IdentifierInfo *, MacroInfo *> Macro = Names[I].getMacro();
       Macro.second->setHidden(!Macro.second->isPublic());
diff --git a/clang/test/Modules/Inputs/MethodPoolA.h b/clang/test/Modules/Inputs/MethodPoolA.h
index 6af24a92911..ababb020097 100644
--- a/clang/test/Modules/Inputs/MethodPoolA.h
+++ b/clang/test/Modules/Inputs/MethodPoolA.h
@@ -6,3 +6,9 @@
 + (int)method1;
 - (int)method2:(int)param;
 @end
+
+@interface B : A
+@end
+
+@interface C
+@end
diff --git a/clang/test/Modules/Inputs/MethodPoolASub.h b/clang/test/Modules/Inputs/MethodPoolASub.h
index 0b36dfa6600..46fe0e11f23 100644
--- a/clang/test/Modules/Inputs/MethodPoolASub.h
+++ b/clang/test/Modules/Inputs/MethodPoolASub.h
@@ -1,4 +1,6 @@
 @interface A (Sub)
 - (char)method3;
 - (char*)method4;
+- (void)method5:(C*)obj;
 @end
+
diff --git a/clang/test/Modules/method_pool.m b/clang/test/Modules/method_pool.m
index 712e55d4d64..9a8897b3830 100644
--- a/clang/test/Modules/method_pool.m
+++ b/clang/test/Modules/method_pool.m
@@ -1,15 +1,15 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodules-cache-path=%t -fmodules -I %S/Inputs %s -verify
 
-@import MethodPoolA;
-
-
-// in other file: // expected-note{{using}}
-
 
+@import MethodPoolA;
 
+@interface D
+- (void)method5:(D*)obj;
+@end
 
-// in other file: expected-note{{also found}}
+// in other file: // expected-note@7{{using}}
+// in other file: expected-note@12{{also found}}
 
 void testMethod1(id object) {
   [object method1]; 
@@ -23,6 +23,10 @@ void testMethod4(id object) {
   [object method4]; // expected-warning{{instance method '-method4' not found (return type defaults to 'id')}}
 } 
 
+void testMethod5(id object, D* d) {
+  [object method5:d];
+}
+
 @import MethodPoolB;
 
 void testMethod1Again(id object) {
@@ -54,3 +58,7 @@ void testMethod3AgainAgain(id object) {
 void testMethod4Again(id object) {
   [object method4];
 } 
+
+void testMethod5Again(id object, D* d) {
+  [object method5:d];
+}