1 files changed, 42 insertions, 8 deletions
diff --git a/test/Modules/method_pool.m b/test/Modules/method_pool.m
index 25582ca..9a8897b 100644
--- a/test/Modules/method_pool.m
+++ b/test/Modules/method_pool.m
@@ -1,15 +1,15 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodule-cache-path %t -fmodules -I %S/Inputs %s -verify
+// RUN: %clang_cc1 -fmodules-cache-path=%t -fmodules -I %S/Inputs %s -verify
 
-@__experimental_modules_import MethodPoolA;
 
+@import MethodPoolA;
 
-// in other file: // expected-note{{using}}
+@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]; 
@@ -19,7 +19,15 @@ void testMethod2(id object) {
   [object method2:1];
 } 
 
-@__experimental_modules_import MethodPoolB;
+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) {
   [object method1];
@@ -28,3 +36,29 @@ void testMethod1Again(id object) {
 void testMethod2Again(id object) {
   [object method2:1]; // expected-warning{{multiple methods named 'method2:' found}}
 }
+
+void testMethod3(id object) {
+  [object method3]; // expected-warning{{instance method '-method3' not found (return type defaults to 'id')}}
+}
+
+@import MethodPoolB.Sub;
+
+void testMethod3Again(id object) {
+  char *str = [object method3]; // okay: only found in MethodPoolB.Sub
+}
+
+@import MethodPoolA.Sub;
+
+void testMethod3AgainAgain(id object) {
+  [object method3]; // expected-warning{{multiple methods named 'method3' found}}
+  // expected-note@2{{using}}
+  // expected-note@2{{also found}}
+}
+
+void testMethod4Again(id object) {
+  [object method4];
+} 
+
+void testMethod5Again(id object, D* d) {
+  [object method5:d];
+}